[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2024-08-22 Thread WANG Xuerui
commit: 41fe29f25df520646e2373b139750195596e9a92
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu Aug 22 08:48:03 2024 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu Aug 22 08:48:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fe29f2

sys-process/criu: keyword 3.19 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-process/criu/criu-3.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.19.ebuild 
b/sys-process/criu/criu-3.19.ebuild
index a94266a0c6f9..52078c69f2ea 100644
--- a/sys-process/criu/criu-3.19.ebuild
+++ b/sys-process/criu/criu-3.19.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2024-08-22 Thread WANG Xuerui
commit: f72e0168f428374600cdaecc60a24ea87bfee859
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu Aug 22 08:46:26 2024 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu Aug 22 08:46:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72e0168

sys-process/criu: add build support for loong

See: https://github.com/checkpoint-restore/criu/pull/2183
Signed-off-by: WANG Xuerui  gentoo.org>

 sys-process/criu/criu-3.19.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-process/criu/criu-3.19.ebuild 
b/sys-process/criu/criu-3.19.ebuild
index 42928cbad03b..a94266a0c6f9 100644
--- a/sys-process/criu/criu-3.19.ebuild
+++ b/sys-process/criu/criu-3.19.ebuild
@@ -70,6 +70,7 @@ criu_arch() {
case ${ARCH} in
amd64) echo "x86";;
arm64) echo "aarch64";;
+   loong) echo "loongarch64";;
ppc64*) echo "ppc64";;
*) echo "${ARCH}";;
esac



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2024-04-29 Thread Joonas Niilola
commit: 7305f21139aadf3681fb25f8be34e5f9bfc33982
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Apr 29 10:31:31 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 29 10:31:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7305f211

sys-process/criu: Stabilize 3.19 amd64, #930920

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-process/criu/criu-3.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.19.ebuild 
b/sys-process/criu/criu-3.19.ebuild
index 1627b36e1974..42928cbad03b 100644
--- a/sys-process/criu/criu-3.19.ebuild
+++ b/sys-process/criu/criu-3.19.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 -riscv"
+KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2024-02-22 Thread Patrick McLean
commit: 41f8984d9a016a06ada5379333d02ecab48b0b47
Author: Patrick McLean  gentoo  org>
AuthorDate: Thu Feb 22 18:38:04 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Feb 22 18:38:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f8984d

sys-process/criu: add 3.19

Closes: https://bugs.gentoo.org/910304
Closes: https://bugs.gentoo.org/887179
Closes: https://bugs.gentoo.org/832081
Signed-off-by: Patrick McLean  gentoo.org>

 sys-process/criu/Manifest  |   1 +
 sys-process/criu/criu-3.19.ebuild  | 196 +
 sys-process/criu/files/criu-3.19-buildsystem.patch |  33 
 3 files changed, 230 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 8c033e463e65..4fd5b7cfc5d1 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,2 +1,3 @@
 DIST criu-3.17.tar.gz 1321713 BLAKE2B 
3bc13a7df0da0a17c74e0c12f07b81fe7f294be4d1980647b64c74e35383416ffbc10e7c04398f307bc68ff701f76a9586ea58825057b0df16b40f6aab3cbd0e
 SHA512 
febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804
 DIST criu-3.18.tar.gz 1354367 BLAKE2B 
3e6613bc44355d4544541ec399ca462eed12203327f832e3c72ea2ccc772afbe2947f760de452b776299af36576880b189ce7583ce7f74c12225d86d1247c2ab
 SHA512 
3d15554ebd2d08c8904c23b0aba00d505891c14caa4790c2fd12ad6b20bf4058fd210f1d03fd63aacc5ad8bc47e341396b48abbeb474f1fd43c3023fd1ff9171
+DIST criu-3.19.tar.gz 1379938 BLAKE2B 
c55c8e9cf7752ac1e6d7d99a3f87f98440f2054026bec2d5bed76ff5838e8e2dfa2a5fa9c8d17d60fc6da165260187d002ede6fa49f6902a0a6fe8461b12b479
 SHA512 
d243818cdac51580c952a80e9164786a67ce5e294c0faa6dc700f5e8da8e36495f0b64f5c27b345ede7d6697ed7a69fa4e9a85cef451f32e3ffeb78564884571

diff --git a/sys-process/criu/criu-3.19.ebuild 
b/sys-process/criu/criu-3.19.ebuild
new file mode 100644
index ..2b1575bbe858
--- /dev/null
+++ b/sys-process/criu/criu-3.19.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit fcaps flag-o-matic toolchain-funcs linux-info distutils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="
+   https://criu.org/
+   https://github.com/checkpoint-restore/
+"
+SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
+IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   >=dev-libs/protobuf-c-1.4.0:=
+   dev-libs/libnl:3=
+   net-libs/libnet:1.1=
+   sys-libs/libcap:=
+   bpf? ( dev-libs/libbpf:= )
+   gnutls? ( net-libs/gnutls:= )
+   nftables? ( net-libs/gnutls:= )
+   selinux? ( sys-libs/libselinux:= )
+   setproctitle? ( dev-libs/libbsd:= )
+   video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+"
+BDEPEND="
+   doc? (
+   app-text/asciidoc
+   app-text/xmlto
+   )
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL 
~INOTIFY_USER
+   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+   "${FILESDIR}/2.2/criu-2.2-flags.patch"
+   "${FILESDIR}/2.3/criu-2.3-no-git.patch"
+   "${FILESDIR}/criu-3.12-automagic-libbsd.patch"
+   "${FILESDIR}/criu-3.19-buildsystem.patch"
+)
+
+FILECAPS=(
+   -m 0755 cap_checkpoint_restore usr/sbin/criu
+)
+
+criu_arch() {
+   # criu infers the arch from $(uname -m).  We never want this to happen.
+   case ${ARCH} in
+   amd64) echo "x86";;
+   arm64) echo "aarch64";;
+   ppc64*) echo "ppc64";;
+   *) echo "${ARCH}";;
+   esac
+}
+
+pkg_setup() {
+   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   distutils-r1_src_prepare
+   use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+criu_use() {
+   if ! use "${1}"; then
+   sed \
+   -e "s:${2:-${1}}:no_${2:-lib${1}}:g" \
+   -i Makefile.config || die
+   fi
+}
+
+criu_python() {
+   local -x \
+   CRIU_VERSION_MAJOR="$(ver_cut 1)" \
+   CRIU_VERSION_MINOR=$(ver_cut 2) \
+   CRIU_VERSION_SUBLEVEL=$(ver_cut 3)
+
+   "${@}"
+}
+
+src_configure() {
+   # Gold linker generates invalid object file when used with criu's custom
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2024-01-21 Thread Florian Schmaus
commit: 9bf55fc542fa38908dbd2c49245f6a3436bc68c9
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sun Jan 21 15:13:39 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jan 21 15:14:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf55fc5

sys-process/criu: don't install suid if USE=-filecaps

Signed-off-by: Florian Schmaus  gentoo.org>

 sys-process/criu/{criu-3.18.ebuild => criu-3.18-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.18.ebuild 
b/sys-process/criu/criu-3.18-r1.ebuild
similarity index 98%
rename from sys-process/criu/criu-3.18.ebuild
rename to sys-process/criu/criu-3.18-r1.ebuild
index ad3e67b7d23a..58a469e59416 100644
--- a/sys-process/criu/criu-3.18.ebuild
+++ b/sys-process/criu/criu-3.18-r1.ebuild
@@ -62,7 +62,7 @@ PATCHES=(
 )
 
 FILECAPS=(
-   cap_checkpoint_restore usr/sbin/criu
+   -m 0755 cap_checkpoint_restore usr/sbin/criu
 )
 
 criu_arch() {



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2024-01-21 Thread Florian Schmaus
commit: 69bc698b3ae809a978167a763a30b22b59c39f1b
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sun Jan 21 14:51:00 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jan 21 14:51:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69bc698b

sys-process/criu: fix filecaps, set on usr/sbin instead of usr/bin

Closes: https://bugs.gentoo.org/922611
Signed-off-by: Florian Schmaus  gentoo.org>

 sys-process/criu/criu-3.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.18.ebuild 
b/sys-process/criu/criu-3.18.ebuild
index be93c33e7d03..ad3e67b7d23a 100644
--- a/sys-process/criu/criu-3.18.ebuild
+++ b/sys-process/criu/criu-3.18.ebuild
@@ -62,7 +62,7 @@ PATCHES=(
 )
 
 FILECAPS=(
-   cap_checkpoint_restore usr/bin/criu
+   cap_checkpoint_restore usr/sbin/criu
 )
 
 criu_arch() {



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2024-01-21 Thread Florian Schmaus
commit: 0b3a2136634e16e7a2b6a22ae95810512ca089dd
Author: Florian Schmaus  gentoo  org>
AuthorDate: Thu Jan 11 09:28:35 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jan 21 09:44:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3a2136

sys-process/criu: add support for rootless CRIU via filecaps

Closes: https://bugs.gentoo.org/921763
Closes: https://github.com/gentoo/gentoo/pull/34742
Signed-off-by: Florian Schmaus  gentoo.org>

 sys-process/criu/criu-3.18.ebuild | 8 ++--
 sys-process/criu/metadata.xml | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-process/criu/criu-3.18.ebuild 
b/sys-process/criu/criu-3.18.ebuild
index 4dcfb79c1ff1..be93c33e7d03 100644
--- a/sys-process/criu/criu-3.18.ebuild
+++ b/sys-process/criu/criu-3.18.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit toolchain-funcs linux-info distutils-r1
+inherit fcaps toolchain-funcs linux-info distutils-r1
 
 DESCRIPTION="utility to checkpoint/restore a process tree"
 HOMEPAGE="
@@ -61,6 +61,10 @@ PATCHES=(
"${FILESDIR}/criu-3.18-buildsystem.patch"
 )
 
+FILECAPS=(
+   cap_checkpoint_restore usr/bin/criu
+)
+
 criu_arch() {
# criu infers the arch from $(uname -m).  We never want this to happen.
case ${ARCH} in

diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index 5f7652d71661..748d2c99ee6c 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -10,6 +10,7 @@
Gentoo Virtualization Project


+   Install the criu binary with file 
capabilities to allow for rootless CRIU
Use dev-libs/libbsd to 
make process titles of service workers to be more verbose
Add support for BPF programs via 
dev-libs/libbpf
Add support for 
net-firewall/nftables



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2023-07-07 Thread Sam James
commit: eeaca6cdda710b8c57b1fcbd5878e762d8723340
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  8 03:38:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  8 03:38:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeaca6cd

sys-process/criu: Stabilize 3.18 arm64, #909811

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.18.ebuild 
b/sys-process/criu/criu-3.18.ebuild
index c6ee165ae8f3..4dcfb79c1ff1 100644
--- a/sys-process/criu/criu-3.18.ebuild
+++ b/sys-process/criu/criu-3.18.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 -riscv"
+KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2023-07-06 Thread Sam James
commit: e252ca69e500fd46639269e037bad63285612395
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  7 04:40:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  7 04:40:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e252ca69

sys-process/criu: Stabilize 3.18 ppc64, #909811

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.18.ebuild 
b/sys-process/criu/criu-3.18.ebuild
index 16fc43ff6379..c6ee165ae8f3 100644
--- a/sys-process/criu/criu-3.18.ebuild
+++ b/sys-process/criu/criu-3.18.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 -riscv"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2023-07-06 Thread Sam James
commit: f5f9369185642a1a07e479086be5992bdf961012
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  7 03:36:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  7 03:36:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f93691

sys-process/criu: Stabilize 3.18 amd64, #909811

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.18.ebuild 
b/sys-process/criu/criu-3.18.ebuild
index a87a2907ba4a..16fc43ff6379 100644
--- a/sys-process/criu/criu-3.18.ebuild
+++ b/sys-process/criu/criu-3.18.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/

2023-05-05 Thread Patrick McLean
commit: 120aaef2153b8f40bd902888dbbf0cf71efb86e9
Author: Patrick McLean  gentoo  org>
AuthorDate: Sat May  6 00:01:12 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Sat May  6 00:01:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120aaef2

sys-process/criu: add 3.18

Signed-off-by: Patrick McLean  gentoo.org>

 sys-process/criu/Manifest  |   1 +
 sys-process/criu/criu-3.18.ebuild  | 183 +
 sys-process/criu/files/criu-3.18-buildsystem.patch |  57 +++
 3 files changed, 241 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 17a9661b07b3..8c033e463e65 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1 +1,2 @@
 DIST criu-3.17.tar.gz 1321713 BLAKE2B 
3bc13a7df0da0a17c74e0c12f07b81fe7f294be4d1980647b64c74e35383416ffbc10e7c04398f307bc68ff701f76a9586ea58825057b0df16b40f6aab3cbd0e
 SHA512 
febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804
+DIST criu-3.18.tar.gz 1354367 BLAKE2B 
3e6613bc44355d4544541ec399ca462eed12203327f832e3c72ea2ccc772afbe2947f760de452b776299af36576880b189ce7583ce7f74c12225d86d1247c2ab
 SHA512 
3d15554ebd2d08c8904c23b0aba00d505891c14caa4790c2fd12ad6b20bf4058fd210f1d03fd63aacc5ad8bc47e341396b48abbeb474f1fd43c3023fd1ff9171

diff --git a/sys-process/criu/criu-3.18.ebuild 
b/sys-process/criu/criu-3.18.ebuild
new file mode 100644
index ..a87a2907ba4a
--- /dev/null
+++ b/sys-process/criu/criu-3.18.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit toolchain-funcs linux-info distutils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="
+   https://criu.org/
+   https://github.com/checkpoint-restore/
+"
+SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
+IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   >=dev-libs/protobuf-c-1.4.0:=
+   dev-libs/libnl:3=
+   net-libs/libnet:1.1=
+   sys-libs/libcap:=
+   bpf? ( dev-libs/libbpf:= )
+   gnutls? ( net-libs/gnutls:= )
+   nftables? ( net-libs/gnutls:= )
+   selinux? ( sys-libs/libselinux:= )
+   setproctitle? ( dev-libs/libbsd:= )
+   video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+"
+BDEPEND="
+   doc? (
+   app-text/asciidoc
+   app-text/xmlto
+   )
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL 
~INOTIFY_USER
+   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+   "${FILESDIR}/2.2/criu-2.2-flags.patch"
+   "${FILESDIR}/2.3/criu-2.3-no-git.patch"
+   "${FILESDIR}/criu-3.12-automagic-libbsd.patch"
+   "${FILESDIR}/criu-3.18-buildsystem.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";;
+   ppc64*) echo "ppc64";;
+   *) echo "${ARCH}";;
+   esac
+}
+
+pkg_setup() {
+   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   distutils-r1_src_prepare
+   use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+criu_use() {
+   if ! use "${1}"; then
+   sed \
+   -e "s:${2:-${1}}:no_${2:-lib${1}}:g" \
+   -i Makefile.config || die
+   fi
+}
+
+criu_python() {
+   local -x \
+   CRIU_VERSION_MAJOR="$(ver_cut 1)" \
+   CRIU_VERSION_MINOR=$(ver_cut 2) \
+   CRIU_VERSION_SUBLEVEL=$(ver_cut 3)
+
+   "${@}"
+}
+
+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
+
+   # Build system uses this variable as a trigger to append coverage flags
+   # we'd like to avoid it. https://bugs.gentoo.org/744244
+   unset GCOV
+
+   # we have to sed the Makefile.config to disable automagic deps
+   criu_use selinux
+   criu_use bpf
+   criu_use nftables
+   criu_use video_cards_amdgpu libdrm
+
+   emake_opts=(
+   SETPROCTITLE=

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2023-05-01 Thread Sam James
commit: 1e683365b534b1086d00d349817e9be443a6cf2a
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 12:52:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 12:52:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e683365

sys-process/criu: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index bec8a7d57bfc..5f7652d71661 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -14,4 +14,7 @@
Add support for BPF programs via 
dev-libs/libbpf
Add support for 
net-firewall/nftables

+   
+   checkpoint-restore/criu
+   
 



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2023-05-01 Thread Sam James
commit: 65fbfa15aa71be1fde62e9fcbffbda0b3d69f336
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 12:48:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 12:49:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65fbfa15

sys-process/criu: drop 3.15, 3.15-r3, 3.16.1

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/Manifest  |   2 -
 sys-process/criu/criu-3.15-r3.ebuild   | 140 ---
 sys-process/criu/criu-3.15.ebuild  | 139 ---
 sys-process/criu/criu-3.16.1.ebuild| 162 -
 sys-process/criu/files/criu-3.15-pkg-config.patch  | 141 ---
 .../criu/files/criu-3.15-protobuf-c-1.4.0.patch| 194 -
 6 files changed, 778 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 8e3b332bc860..17a9661b07b3 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1 @@
-DIST criu-3.15.tar.bz2 913904 BLAKE2B 
2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159
 SHA512 
7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
-DIST criu-3.16.1.tar.gz 1228535 BLAKE2B 
45aa87ee00a18b91474e767dc0326cce6c0942af7771a0c5536751361c171c86ba2065c54587e82b51fd6d7ab116e659324369955086c5237cd7fd26b60d6ce6
 SHA512 
a558af41f1927a1b1d87f8d11163a5f3d2e4f83a74aba00619b45a6d464d5477a6a0aac3c1b9d9a17e3343a4bf21a3fd6b279b51fa0c347c86c307381a4d0739
 DIST criu-3.17.tar.gz 1321713 BLAKE2B 
3bc13a7df0da0a17c74e0c12f07b81fe7f294be4d1980647b64c74e35383416ffbc10e7c04398f307bc68ff701f76a9586ea58825057b0df16b40f6aab3cbd0e
 SHA512 
febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804

diff --git a/sys-process/criu/criu-3.15-r3.ebuild 
b/sys-process/criu/criu-3.15-r3.ebuild
deleted file mode 100644
index f4108c16202b..
--- a/sys-process/criu/criu-3.15-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit toolchain-funcs linux-info python-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 ppc64 -riscv"
-IUSE="doc selinux setproctitle static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-libs/protobuf-c-1.4.0:=
-   dev-libs/libnl:3
-   net-libs/libnet:1.1
-   sys-libs/libcap
-   selinux? ( sys-libs/libselinux )
-   setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? (
-   app-text/asciidoc
-   app-text/xmlto
-   )"
-RDEPEND="${RDEPEND}
-   dev-python/protobuf-python[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL 
~INOTIFY_USER
-   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
-
-# root access required for tests
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-   "${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
-   "${FILESDIR}"/${PN}-3.15-pkg-config.patch
-   "${FILESDIR}"/${PN}-3.15-protobuf-c-1.4.0.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";;
-   ppc64*) echo "ppc64";;
-   *) echo "${ARCH}";;
-   esac
-}
-
-pkg_setup() {
-   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
-   linux-info_pkg_setup
-}
-
-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
-
-   # Build system uses this variable as a trigger to append coverage flags
-   # we'd like to avoid it. https://bugs.gentoo.org/744244
-   unset GCOV
-
-   python_setup
-}
-
-src_compile() {
-   local target="all $(usex doc 'docs' '')"
-   emake \
-   HOSTCC="$(tc-getBUILD_CC)" \
-   CC="$(tc-getCC)" \
-   LD="$(tc-getLD)" \
-   AR="$(tc-getAR)" \
-   PKG_CONFIG="$(tc-

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2023-02-25 Thread Joonas Niilola
commit: b6d786f938ab1ae4ce4b5f5b70aedb101609f148
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Feb 25 12:47:47 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Feb 25 12:48:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d786f9

sys-process/criu: enable py3.11

Closes: https://bugs.gentoo.org/897324
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-process/criu/criu-3.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.17-r1.ebuild 
b/sys-process/criu/criu-3.17-r1.ebuild
index 5a3ee203df0d..43c010f69cc1 100644
--- a/sys-process/criu/criu-3.17-r1.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit toolchain-funcs linux-info python-r1
 



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-11-15 Thread Michał Górny
commit: bc220f03a29066eaeb5ec6f0078ebd451d96a976
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Nov 15 18:20:22 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Nov 15 18:20:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc220f03

sys-process/criu: Remove py3.8-only versions

Signed-off-by: Michał Górny  gentoo.org>

 sys-process/criu/Manifest|   1 -
 sys-process/criu/criu-3.14-r2.ebuild | 138 ---
 2 files changed, 139 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4f343f4a67bd..8e3b332bc860 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,4 +1,3 @@
-DIST criu-3.14.tar.bz2 881407 BLAKE2B 
418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b
 SHA512 
97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb3be398911cc2c995310b17cc6
 DIST criu-3.15.tar.bz2 913904 BLAKE2B 
2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159
 SHA512 
7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
 DIST criu-3.16.1.tar.gz 1228535 BLAKE2B 
45aa87ee00a18b91474e767dc0326cce6c0942af7771a0c5536751361c171c86ba2065c54587e82b51fd6d7ab116e659324369955086c5237cd7fd26b60d6ce6
 SHA512 
a558af41f1927a1b1d87f8d11163a5f3d2e4f83a74aba00619b45a6d464d5477a6a0aac3c1b9d9a17e3343a4bf21a3fd6b279b51fa0c347c86c307381a4d0739
 DIST criu-3.17.tar.gz 1321713 BLAKE2B 
3bc13a7df0da0a17c74e0c12f07b81fe7f294be4d1980647b64c74e35383416ffbc10e7c04398f307bc68ff701f76a9586ea58825057b0df16b40f6aab3cbd0e
 SHA512 
febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804

diff --git a/sys-process/criu/criu-3.14-r2.ebuild 
b/sys-process/criu/criu-3.14-r2.ebuild
deleted file mode 100644
index ff07deb57d84..
--- a/sys-process/criu/criu-3.14-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit toolchain-funcs linux-info python-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 ~ppc64 -riscv"
-IUSE="doc selinux setproctitle static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-libs/protobuf-c
-   dev-libs/libnl:3
-   net-libs/libnet:1.1
-   sys-libs/libcap
-   selinux? ( sys-libs/libselinux )
-   setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-   doc? (
-   app-text/asciidoc
-   app-text/xmlto
-   )"
-RDEPEND="${RDEPEND}
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   dev-python/ipaddr[${PYTHON_USEDEP}]
-"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL 
~INOTIFY_USER
-   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
-
-# root access required for tests
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-   "${FILESDIR}"/${PN}-3.12-automagic-libbsd.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";;
-   ppc64*) echo "ppc64";;
-   *) echo "${ARCH}";;
-   esac
-}
-
-pkg_setup() {
-   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
-   linux-info_pkg_setup
-}
-
-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
-
-   # Build system uses this variable as a trigger to append coverage flags
-   # we'd like to avoid it. https://bugs.gentoo.org/744244
-   unset GCOV
-
-   python_setup
-}
-
-src_compile() {
-   local target="all $(usex doc 'docs' '')"
-   emake \
-   HOSTCC="$(tc-getBUILD_CC)" \
-   CC="$(tc-getCC)" \
-   LD="$(tc-getLD)" \
-   AR="$(tc-getAR)" \
-   PYTHON="${EPYTHON%.?}" \
-   FULL_PYTHON="${PYTHON%.?}" \
-   

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-11-02 Thread Sam James
commit: f15e9e21bed85e2ffe3718293b5677a7d92c9c50
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov  3 06:14:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov  3 06:14:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f15e9e21

sys-process/criu: Stabilize 3.17-r1 ppc64, #879219

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.17-r1.ebuild 
b/sys-process/criu/criu-3.17-r1.ebuild
index f2c0627740f7..53b080952c48 100644
--- a/sys-process/criu/criu-3.17-r1.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 -riscv"
+KEYWORDS="~amd64 ~arm arm64 ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-11-02 Thread Sam James
commit: 8c51245c906f60951c49994cafc967f7aab92643
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov  3 06:15:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov  3 06:15:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c51245c

sys-process/criu: Stabilize 3.17-r1 amd64, #879219

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.17-r1.ebuild 
b/sys-process/criu/criu-3.17-r1.ebuild
index 53b080952c48..22cf532a2154 100644
--- a/sys-process/criu/criu-3.17-r1.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 -riscv"
+KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-11-02 Thread Sam James
commit: 79b0ef1fcbb5d1d0a293a090c47e0ee9d00aab0a
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  2 23:13:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  2 23:13:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b0ef1f

sys-process/criu: Stabilize 3.17-r1 arm64, #879219

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.17-r1.ebuild 
b/sys-process/criu/criu-3.17-r1.ebuild
index 92fb5dbc8119..f2c0627740f7 100644
--- a/sys-process/criu/criu-3.17-r1.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2022-09-02 Thread Sam James
commit: 359a6c0eb116c0f9afbf6afa94b7e8936ed5ffc5
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 00:33:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 00:33:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359a6c0e

sys-process/criu: add additional glibc-2.36 fix

Closes: https://bugs.gentoo.org/868099
Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.17-r1.ebuild   |  1 +
 .../criu/files/criu-3.17-glibc-2.36-deux.patch | 99 ++
 2 files changed, 100 insertions(+)

diff --git a/sys-process/criu/criu-3.17-r1.ebuild 
b/sys-process/criu/criu-3.17-r1.ebuild
index ac5e1722d999..92fb5dbc8119 100644
--- a/sys-process/criu/criu-3.17-r1.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
 
"${FILESDIR}/${P}-amdgpu-build-fixes.patch"
"${FILESDIR}/${PN}-3.17-glibc-2.36.patch"
+   "${FILESDIR}/${PN}-3.17-glibc-2.36-deux.patch"
 )
 
 criu_arch() {

diff --git a/sys-process/criu/files/criu-3.17-glibc-2.36-deux.patch 
b/sys-process/criu/files/criu-3.17-glibc-2.36-deux.patch
new file mode 100644
index ..ca911d82779d
--- /dev/null
+++ b/sys-process/criu/files/criu-3.17-glibc-2.36-deux.patch
@@ -0,0 +1,99 @@
+https://github.com/checkpoint-restore/criu/commit/517c0947050e63aac72f63a3bf373d76264723b9
+https://bugs.gentoo.org/868099
+
+From: Radostin Stoyanov 
+Date: Wed, 24 Aug 2022 21:20:30 +0200
+Subject: [PATCH] mount: add definition for FSOPEN_CLOEXEC
+
+A recent change in glibc introduced `enum fsconfig_command` [1] and as a
+result the compilation of criu fails with the following errors
+
+In file included from criu/pie/util.c:3:
+/usr/include/sys/mount.h:240:6: error: redeclaration of 'enum fsconfig_command'
+  240 | enum fsconfig_command
+  |  ^~~~
+In file included from /usr/include/sys/mount.h:32:
+criu/include/linux/mount.h:11:6: note: originally defined here
+   11 | enum fsconfig_command {
+  |  ^~~~
+/usr/include/sys/mount.h:242:3: error: redeclaration of enumerator 
'FSCONFIG_SET_FLAG'
+  242 |   FSCONFIG_SET_FLAG   = 0,/* Set parameter, supplying no value 
*/
+  |   ^
+criu/include/linux/mount.h:12:9: note: previous definition of 
'FSCONFIG_SET_FLAG' with type 'enum fsconfig_command'
+   12 | FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
+  | ^
+/usr/include/sys/mount.h:244:3: error: redeclaration of enumerator 
'FSCONFIG_SET_STRING'
+  244 |   FSCONFIG_SET_STRING = 1,/* Set parameter, supplying a string 
value */
+  |   ^~~
+criu/include/linux/mount.h:14:9: note: previous definition of 
'FSCONFIG_SET_STRING' with type 'enum fsconfig_command'
+   14 | FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string 
value */
+  | ^~~
+/usr/include/sys/mount.h:246:3: error: redeclaration of enumerator 
'FSCONFIG_SET_BINARY'
+  246 |   FSCONFIG_SET_BINARY = 2,/* Set parameter, supplying a binary 
blob value */
+  |   ^~~
+criu/include/linux/mount.h:16:9: note: previous definition of 
'FSCONFIG_SET_BINARY' with type 'enum fsconfig_command'
+   16 | FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary 
blob value */
+  | ^~~
+/usr/include/sys/mount.h:248:3: error: redeclaration of enumerator 
'FSCONFIG_SET_PATH'
+  248 |   FSCONFIG_SET_PATH   = 3,/* Set parameter, supplying an 
object by path */
+  |   ^
+criu/include/linux/mount.h:18:9: note: previous definition of 
'FSCONFIG_SET_PATH' with type 'enum fsconfig_command'
+   18 | FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object 
by path */
+  | ^
+/usr/include/sys/mount.h:250:3: error: redeclaration of enumerator 
'FSCONFIG_SET_PATH_EMPTY'
+  250 |   FSCONFIG_SET_PATH_EMPTY = 4,/* Set parameter, supplying an 
object by (empty) path */
+  |   ^~~
+criu/include/linux/mount.h:20:9: note: previous definition of 
'FSCONFIG_SET_PATH_EMPTY' with type 'enum fsconfig_command'
+   20 | FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an 
object by (empty) path */
+  | ^~~
+/usr/include/sys/mount.h:252:3: error: redeclaration of enumerator 
'FSCONFIG_SET_FD'
+  252 |   FSCONFIG_SET_FD = 5,/* Set parameter, supplying an 
object by fd */
+  |   ^~~
+criu/include/linux/mount.h:22:9: note: previous definition of 
'FSCONFIG_SET_FD' with type 'enum fsconfig_command'
+   22 | FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by 
fd */
+  | ^~~
+/usr/include/sys/mount.h:254:3: error: redeclaration of enumerator 
'FSCONFIG_CMD_CREATE'
+  254 |   FSCONFIG_CMD_CREATE = 6,/* Invoke superblock creation */
+  |   ^~~
+cri

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/

2022-08-04 Thread Sam James
commit: 97d4262f6c82af3f9c1c73e7d2345198114d92ed
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug  5 01:02:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug  5 01:02:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d4262f

sys-process/criu: fix build w/ glibc 2.36

Closes: https://bugs.gentoo.org/863683
Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.17-r1.ebuild  |   1 +
 sys-process/criu/files/criu-3.17-glibc-2.36.patch | 242 ++
 2 files changed, 243 insertions(+)

diff --git a/sys-process/criu/criu-3.17-r1.ebuild 
b/sys-process/criu/criu-3.17-r1.ebuild
index 66993d5ce406..ac5e1722d999 100644
--- a/sys-process/criu/criu-3.17-r1.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}/criu-3.16.1-buildsystem.patch"
 
"${FILESDIR}/${P}-amdgpu-build-fixes.patch"
+   "${FILESDIR}/${PN}-3.17-glibc-2.36.patch"
 )
 
 criu_arch() {

diff --git a/sys-process/criu/files/criu-3.17-glibc-2.36.patch 
b/sys-process/criu/files/criu-3.17-glibc-2.36.patch
new file mode 100644
index ..5387c5a5b97c
--- /dev/null
+++ b/sys-process/criu/files/criu-3.17-glibc-2.36.patch
@@ -0,0 +1,242 @@
+https://bugs.gentoo.org/863683
+https://github.com/checkpoint-restore/criu/pull/1943
+
+From 8cd5fccd6cf3d03afb5abe463134d31f54d42258 Mon Sep 17 00:00:00 2001
+From: Radostin Stoyanov 
+Date: Sun, 31 Jul 2022 16:07:30 +
+Subject: [PATCH 2/2] criu: fix conflicting headers
+
+There are several changes in glibc 2.36 that make sys/mount.h header
+incompatible with kernel headers:
+
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+This patch removes conflicting includes for `` and
+updates the content of `criu/include/linux/mount.h` to match
+`/usr/include/sys/mount.h`. In addition, inline definitions sys_*()
+functions have been moved from "linux/mount.h" to "syscall.h" to
+avoid conflicts with `uapi/compel/plugins/std/syscall.h` and
+``. The include for `` has been replaced
+with local include to avoid conflicts with ``.
+
+Fixes: #1949
+
+Signed-off-by: Radostin Stoyanov 
+--- a/criu/cgroup.c
 b/criu/cgroup.c
+@@ -27,6 +27,7 @@
+ #include "images/cgroup.pb-c.h"
+ #include "kerndat.h"
+ #include "linux/mount.h"
++#include "syscall.h"
+ 
+ /*
+  * This structure describes set of controller groups
+--- a/criu/cr-check.c
 b/criu/cr-check.c
+@@ -21,7 +21,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ 
+ #include "../soccr/soccr.h"
+ 
+@@ -52,6 +51,7 @@
+ #include "net.h"
+ #include "restorer.h"
+ #include "uffd.h"
++#include "linux/aio_abi.h"
+ 
+ #include "images/inventory.pb-c.h"
+ 
+--- a/criu/cr-restore.c
 b/criu/cr-restore.c
+@@ -22,7 +22,6 @@
+ #include 
+ #include "common/compiler.h"
+ 
+-#include "linux/mount.h"
+ #include "linux/rseq.h"
+ 
+ #include "clone-noasan.h"
+@@ -86,6 +85,8 @@
+ #include 
+ #include "compel/include/asm/syscall.h"
+ 
++#include "linux/mount.h"
++
+ #include "protobuf.h"
+ #include "images/sa.pb-c.h"
+ #include "images/timer.pb-c.h"
+--- a/criu/include/aio.h
 b/criu/include/aio.h
+@@ -1,7 +1,7 @@
+ #ifndef __CR_AIO_H__
+ #define __CR_AIO_H__
+ 
+-#include 
++#include "linux/aio_abi.h"
+ #include "images/mm.pb-c.h"
+ unsigned int aio_estimate_nr_reqs(unsigned int size);
+ int dump_aio_ring(MmEntry *mme, struct vma_area *vma);
+--- /dev/null
 b/criu/include/linux/aio_abi.h
+@@ -0,0 +1,14 @@
++#ifndef __LINUX__AIO_ABI_H
++#define __LINUX__AIO_ABI_H
++
++typedef __kernel_ulong_t aio_context_t;
++
++/* read() from /dev/aio returns these structures. */
++struct io_event {
++  __u64 data; /* the data field from the iocb */
++  __u64 obj;  /* what iocb this event came from */
++  __s64 res;  /* result code for this event */
++  __s64 res2; /* secondary result */
++};
++
++#endif /* __LINUX__AIO_ABI_H */
+--- a/criu/include/linux/mount.h
 b/criu/include/linux/mount.h
+@@ -4,32 +4,34 @@
+ #include "common/config.h"
+ #include "compel/plugins/std/syscall-codes.h"
+ 
+-#ifdef CONFIG_HAS_FSCONFIG
+-#include 
+-#else
++/* Copied from /usr/include/sys/mount.h */
++
++#ifndef FSCONFIG_CMD_CREATE
++/* The type of fsconfig call made.   */
+ enum fsconfig_command {
+-  FSCONFIG_SET_FLAG = 0,/* Set parameter, supplying no value */
+-  FSCONFIG_SET_STRING = 1,  /* Set parameter, supplying a string 
value */
+-  FSCONFIG_SET_BINARY = 2,  /* Set parameter, supplying a binary blob 
value */
+-  FSCONFIG_SET_PATH = 3,/* Set parameter, supplying an object by 
path */
+-  FSCONFIG_SET_PATH_EMPTY = 4,  /* Set parameter, supplying an object by 
(empty) path */
+-  FSCONFIG_SET_FD = 5,  /* Set parameter, supplying an object by 
fd */
+-  FSCONFIG_CMD_CREATE = 6,  /* Invoke superblock creation */
++  FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
++#define FSCONFIG_SET_FLAG FSCONFIG_

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-07-03 Thread Sam James
commit: 08aba88df5fa672f979aa4a686068f5e57771a0f
Author: matoro  users  noreply  github  com>
AuthorDate: Sun Jul  3 03:29:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  3 23:52:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08aba88d

sys-process/criu: Stabilize 3.16.1 ppc64, #850280

Signed-off-by: matoro  users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26205
Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.16.1.ebuild 
b/sys-process/criu/criu-3.16.1.ebuild
index 3c3a81fab99f..66056971d833 100644
--- a/sys-process/criu/criu-3.16.1.ebuild
+++ b/sys-process/criu/criu-3.16.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 -riscv"
+KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-06-07 Thread Jakov Smolić
commit: fe0954ed99df0591f6e903045d665c656a1ac749
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun  7 08:24:21 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun  7 08:24:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe0954ed

sys-process/criu: Stabilize 3.16.1 arm64, #850280

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-process/criu/criu-3.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.16.1.ebuild 
b/sys-process/criu/criu-3.16.1.ebuild
index ce80d068779d..3c3a81fab99f 100644
--- a/sys-process/criu/criu-3.16.1.ebuild
+++ b/sys-process/criu/criu-3.16.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 -riscv"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-06-06 Thread Joonas Niilola
commit: 39f1cc9213bd47f8c6969fad06246192608d8660
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun  7 05:51:46 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun  7 06:34:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f1cc92

sys-process/criu: Stabilize 3.16.1 amd64, #850280

Signed-off-by: Joonas Niilola  gentoo.org>

 sys-process/criu/criu-3.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.16.1.ebuild 
b/sys-process/criu/criu-3.16.1.ebuild
index 3d7905d61eb3..ce80d068779d 100644
--- a/sys-process/criu/criu-3.16.1.ebuild
+++ b/sys-process/criu/criu-3.16.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-06-03 Thread Sam James
commit: 23479133aae78e2ac1aaaed372cb92b5e96b1b0c
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun  3 07:47:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  3 08:12:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23479133

sys-process/criu: fix comment typo

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.17-r1.ebuild 
b/sys-process/criu/criu-3.17-r1.ebuild
index c850ddf93c80..66993d5ce406 100644
--- a/sys-process/criu/criu-3.17-r1.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -100,7 +100,7 @@ src_configure() {
# we'd like to avoid it. https://bugs.gentoo.org/744244
unset GCOV
 
-   # we have to sed the Makdfile.config to disable automagic deps
+   # we have to sed the Makefile.config to disable automagic deps
criu_use selinux
criu_use bpf
criu_use nftables



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-06-02 Thread Sam James
commit: ca0e234080b3250e5fb9c8964ce5e0f98fbbeef9
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun  3 06:57:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  3 06:58:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca0e2340

sys-process/criu: fix automagic libdrm/amdgpu dependency

Bug: https://github.com/checkpoint-restore/criu/issues/1900
Closes: https://bugs.gentoo.org/846446
Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/{criu-3.17.ebuild => criu-3.17-r1.ebuild} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.17.ebuild 
b/sys-process/criu/criu-3.17-r1.ebuild
similarity index 96%
rename from sys-process/criu/criu-3.17.ebuild
rename to sys-process/criu/criu-3.17-r1.ebuild
index 4ac0facc8cc2..c850ddf93c80 100644
--- a/sys-process/criu/criu-3.17.ebuild
+++ b/sys-process/criu/criu-3.17-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
-IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
+IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test 
video_cards_amdgpu"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -32,6 +32,7 @@ COMMON_DEPEND="
nftables? ( net-libs/gnutls:= )
selinux? ( sys-libs/libselinux:= )
setproctitle? ( dev-libs/libbsd:= )
+   video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
 "
 DEPEND="${COMMON_DEPEND}"
 BDEPEND="
@@ -103,6 +104,7 @@ src_configure() {
criu_use selinux
criu_use bpf
criu_use nftables
+   criu_use video_cards_amdgpu libdrm
 
emake_opts=(
SETPROCTITLE="$(usex setproctitle)"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2022-05-18 Thread Sam James
commit: 2a5e6fa4194077e9d9d3df3596ff84ea10dd91c3
Author: Sam James  gentoo  org>
AuthorDate: Thu May 19 03:16:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 19 03:16:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a5e6fa4

sys-process/criu: add 3.17

Closes: https://bugs.gentoo.org/841014
Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/Manifest  |   1 +
 sys-process/criu/criu-3.17.ebuild  | 164 +
 .../criu/files/criu-3.17-amdgpu-build-fixes.patch  |  98 
 3 files changed, 263 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index afc75c58706a..4f343f4a67bd 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
 DIST criu-3.14.tar.bz2 881407 BLAKE2B 
418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b
 SHA512 
97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb3be398911cc2c995310b17cc6
 DIST criu-3.15.tar.bz2 913904 BLAKE2B 
2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159
 SHA512 
7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
 DIST criu-3.16.1.tar.gz 1228535 BLAKE2B 
45aa87ee00a18b91474e767dc0326cce6c0942af7771a0c5536751361c171c86ba2065c54587e82b51fd6d7ab116e659324369955086c5237cd7fd26b60d6ce6
 SHA512 
a558af41f1927a1b1d87f8d11163a5f3d2e4f83a74aba00619b45a6d464d5477a6a0aac3c1b9d9a17e3343a4bf21a3fd6b279b51fa0c347c86c307381a4d0739
+DIST criu-3.17.tar.gz 1321713 BLAKE2B 
3bc13a7df0da0a17c74e0c12f07b81fe7f294be4d1980647b64c74e35383416ffbc10e7c04398f307bc68ff701f76a9586ea58825057b0df16b40f6aab3cbd0e
 SHA512 
febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804

diff --git a/sys-process/criu/criu-3.17.ebuild 
b/sys-process/criu/criu-3.17.ebuild
new file mode 100644
index ..4ac0facc8cc2
--- /dev/null
+++ b/sys-process/criu/criu-3.17.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs linux-info python-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="
+   https://criu.org/
+   https://github.com/checkpoint-restore/
+"
+SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
+IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   >=dev-libs/protobuf-c-1.4.0:=
+   dev-libs/libnl:3=
+   net-libs/libnet:1.1=
+   sys-libs/libcap:=
+   bpf? ( dev-libs/libbpf:= )
+   gnutls? ( net-libs/gnutls:= )
+   nftables? ( net-libs/gnutls:= )
+   selinux? ( sys-libs/libselinux:= )
+   setproctitle? ( dev-libs/libbsd:= )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? (
+   app-text/asciidoc
+   app-text/xmlto
+   )
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL 
~INOTIFY_USER
+   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+   "${FILESDIR}/2.2/criu-2.2-flags.patch"
+   "${FILESDIR}/2.3/criu-2.3-no-git.patch"
+   "${FILESDIR}/criu-3.12-automagic-libbsd.patch"
+   "${FILESDIR}/criu-3.16.1-buildsystem.patch"
+
+   "${FILESDIR}/${P}-amdgpu-build-fixes.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";;
+   ppc64*) echo "ppc64";;
+   *) echo "${ARCH}";;
+   esac
+}
+
+pkg_setup() {
+   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+criu_use() {
+   if ! use "${1}"; then
+   sed \
+   -e "s:${2:-${1}}:no_${2:-lib${1}}:g" \
+   -i Makefile.config || die
+   fi
+}
+
+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
+
+   # B

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-03-25 Thread Jakov Smolić
commit: fefa04b2adbad4e5abcc218c37368d28fef9929b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Mar 25 09:42:40 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Mar 25 09:42:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefa04b2

sys-process/criu: Mark as -riscv

Riscv is currently not supported:

```
Makefile:23: *** "The architecture riscv isn't supported"
```

Bug: https://bugs.gentoo.org/835975
Signed-off-by: Jakov Smolić  gentoo.org>

 sys-process/criu/criu-3.14-r2.ebuild | 4 ++--
 sys-process/criu/criu-3.15-r3.ebuild | 2 +-
 sys-process/criu/criu-3.15.ebuild| 4 ++--
 sys-process/criu/criu-3.16.1.ebuild  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-process/criu/criu-3.14-r2.ebuild 
b/sys-process/criu/criu-3.14-r2.ebuild
index 82a145ca7254..ff07deb57d84 100644
--- a/sys-process/criu/criu-3.14-r2.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 -riscv"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

diff --git a/sys-process/criu/criu-3.15-r3.ebuild 
b/sys-process/criu/criu-3.15-r3.ebuild
index 196819060d80..ff96ba74e999 100644
--- a/sys-process/criu/criu-3.15-r3.ebuild
+++ b/sys-process/criu/criu-3.15-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

diff --git a/sys-process/criu/criu-3.15.ebuild 
b/sys-process/criu/criu-3.15.ebuild
index 79c927987e04..563fc774acf9 100644
--- a/sys-process/criu/criu-3.15.ebuild
+++ b/sys-process/criu/criu-3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 -riscv"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

diff --git a/sys-process/criu/criu-3.16.1.ebuild 
b/sys-process/criu/criu-3.16.1.ebuild
index ff46a299a4af..3d7905d61eb3 100644
--- a/sys-process/criu/criu-3.16.1.ebuild
+++ b/sys-process/criu/criu-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv"
 IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-03-24 Thread Sam James
commit: bbb259ae5daf0bc7518368f73c3b5e95a5e0e1c8
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 25 04:23:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 25 04:23:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb259ae

sys-process/criu: Stabilize 3.15-r3 arm64, #835974

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.15-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.15-r3.ebuild 
b/sys-process/criu/criu-3.15-r3.ebuild
index a16d88017474..196819060d80 100644
--- a/sys-process/criu/criu-3.15-r3.ebuild
+++ b/sys-process/criu/criu-3.15-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-02-02 Thread Arthur Zamarin
commit: 06a09c08cae68068b2e4a57b631294b861821bab
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Feb  2 20:52:00 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Feb  2 20:52:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a09c08

sys-process/criu: Stabilize 3.15-r3 ppc64, #811705

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-process/criu/criu-3.15-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.15-r3.ebuild 
b/sys-process/criu/criu-3.15-r3.ebuild
index 3c144e513c1b..a16d88017474 100644
--- a/sys-process/criu/criu-3.15-r3.ebuild
+++ b/sys-process/criu/criu-3.15-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ppc64"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2022-02-02 Thread Agostino Sarubbo
commit: 4f9f088e4887760cb012b1de72a04efdb6d98bba
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Feb  2 08:02:14 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Feb  2 08:02:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9f088e

sys-process/criu: amd64 stable wrt bug #811705

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-process/criu/criu-3.15-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/criu/criu-3.15-r3.ebuild 
b/sys-process/criu/criu-3.15-r3.ebuild
index bb76d9a19d33..3c144e513c1b 100644
--- a/sys-process/criu/criu-3.15-r3.ebuild
+++ b/sys-process/criu/criu-3.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2021-12-01 Thread Patrick McLean
commit: 2cf0d86c1a22dfed20f3dda2601adc96986bca9f
Author: Patrick McLean  gentoo  org>
AuthorDate: Thu Dec  2 00:17:10 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Dec  2 00:17:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf0d86c

sys-process/criu: Version bump to 3.16.1 (bug #827955)

Closes: https://bugs.gentoo.org/827955
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean  gentoo.org>

 sys-process/criu/Manifest  |   1 +
 sys-process/criu/criu-3.16.1.ebuild| 162 +
 .../criu/files/criu-3.16.1-buildsystem.patch   |  56 +++
 sys-process/criu/metadata.xml  |   4 +-
 4 files changed, 222 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 84332204a0a5..afc75c58706a 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,2 +1,3 @@
 DIST criu-3.14.tar.bz2 881407 BLAKE2B 
418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b
 SHA512 
97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb3be398911cc2c995310b17cc6
 DIST criu-3.15.tar.bz2 913904 BLAKE2B 
2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159
 SHA512 
7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
+DIST criu-3.16.1.tar.gz 1228535 BLAKE2B 
45aa87ee00a18b91474e767dc0326cce6c0942af7771a0c5536751361c171c86ba2065c54587e82b51fd6d7ab116e659324369955086c5237cd7fd26b60d6ce6
 SHA512 
a558af41f1927a1b1d87f8d11163a5f3d2e4f83a74aba00619b45a6d464d5477a6a0aac3c1b9d9a17e3343a4bf21a3fd6b279b51fa0c347c86c307381a4d0739

diff --git a/sys-process/criu/criu-3.16.1.ebuild 
b/sys-process/criu/criu-3.16.1.ebuild
new file mode 100644
index ..ff46a299a4af
--- /dev/null
+++ b/sys-process/criu/criu-3.16.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs linux-info python-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="
+   https://criu.org/
+   https://github.com/checkpoint-restore/
+"
+SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz";
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   >=dev-libs/protobuf-c-1.4.0:=
+   dev-libs/libnl:3=
+   net-libs/libnet:1.1=
+   sys-libs/libcap:=
+   bpf? ( dev-libs/libbpf:= )
+   gnutls? ( net-libs/gnutls:= )
+   nftables? ( net-libs/gnutls:= )
+   selinux? ( sys-libs/libselinux:= )
+   setproctitle? ( dev-libs/libbsd:= )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? (
+   app-text/asciidoc
+   app-text/xmlto
+   )
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL 
~INOTIFY_USER
+   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+   "${FILESDIR}/2.2/criu-2.2-flags.patch"
+   "${FILESDIR}/2.3/criu-2.3-no-git.patch"
+   "${FILESDIR}/criu-3.12-automagic-libbsd.patch"
+   "${FILESDIR}/criu-3.16.1-buildsystem.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";;
+   ppc64*) echo "ppc64";;
+   *) echo "${ARCH}";;
+   esac
+}
+
+pkg_setup() {
+   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+   linux-info_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
+}
+
+criu_use() {
+   if ! use "${1}"; then
+   sed \
+   -e "s:${2:-${1}}:no_${2:-lib${1}}:g" \
+   -i Makefile.config || die
+   fi
+}
+
+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
+
+   # Build system uses this variable as a trigger to append coverage flags
+   # we'd like to avoid it. https://bugs.gentoo.org/744244
+   unset GCOV
+
+   # we have to sed the Makdfile.config to

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2021-12-01 Thread Sam James
commit: 106d32bbb4359104c8b08e5a8f6c55f5830650f1
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  1 20:33:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  1 20:34:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106d32bb

sys-process/criu: really add extra protobuf-c hunk

Doh!

Bug: https://bugs.gentoo.org/814056
Closes: https://bugs.gentoo.org/822006
Signed-off-by: Sam James  gentoo.org>

 .../{criu-3.15-r2.ebuild => criu-3.15-r3.ebuild}   |  0
 .../criu/files/criu-3.15-protobuf-c-1.4.0.patch| 24 ++
 2 files changed, 24 insertions(+)

diff --git a/sys-process/criu/criu-3.15-r2.ebuild 
b/sys-process/criu/criu-3.15-r3.ebuild
similarity index 100%
rename from sys-process/criu/criu-3.15-r2.ebuild
rename to sys-process/criu/criu-3.15-r3.ebuild

diff --git a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch 
b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
index 5e57fa084975..86d9cd31724d 100644
--- a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
+++ b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
@@ -168,3 +168,27 @@ index 3d64939584..d2bfbf958c 100644
  void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na));
  
  /* Get pid of root task. 0 if not available */
+From: Radostin Stoyanov 
+Date: Fri, 3 Sep 2021 14:14:41 +0100
+Subject: [PATCH] lib: install images/rpc.pb-c.h
+
+Since commit 1c25914 compiling crun with libcriu also requires
+/usr/include/criu/rpc.pb-c.h
+
+Signed-off-by: Radostin Stoyanov 
+---
+ lib/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index f9b66701e0..575a7bad3f 100644
+--- a/lib/Makefile
 b/lib/Makefile
+@@ -1,6 +1,6 @@
+ CRIU_SO   := libcriu.so
+ CRIU_A:= libcriu.a
+-UAPI_HEADERS  := lib/c/criu.h images/rpc.proto criu/include/version.h
++UAPI_HEADERS  := lib/c/criu.h images/rpc.proto images/rpc.pb-c.h 
criu/include/version.h
+ 
+ #
+ # File to keep track of files installed by setup.py



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2021-11-04 Thread Sam James
commit: 582a26d6ebc8a93a086e2117dca3f9e712998832
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov  4 21:09:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov  4 21:09:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=582a26d6

sys-process/criu: add additional protobuf-c patch

Closes: https://bugs.gentoo.org/809092
Closes: https://bugs.gentoo.org/814056
Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/{criu-3.15-r1.ebuild => criu-3.15-r2.ebuild} | 0
 sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch   | 2 ++
 2 files changed, 2 insertions(+)

diff --git a/sys-process/criu/criu-3.15-r1.ebuild 
b/sys-process/criu/criu-3.15-r2.ebuild
similarity index 100%
rename from sys-process/criu/criu-3.15-r1.ebuild
rename to sys-process/criu/criu-3.15-r2.ebuild

diff --git a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch 
b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
index ea0b9134c68..5e57fa08497 100644
--- a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
+++ b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
@@ -1,5 +1,7 @@
 https://bugs.gentoo.org/809092
+https://bugs.gentoo.org/814056
 
https://github.com/checkpoint-restore/criu/commit/1c25914a5dd1eb385937dffdd85901c3f5e39b8c
+https://github.com/checkpoint-restore/criu/commit/6a15dbdefa5c23a75eb3d1137681404588a16efa
 
 From 1c25914a5dd1eb385937dffdd85901c3f5e39b8c Mon Sep 17 00:00:00 2001
 From: Zeyad Yasser 



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2021-09-04 Thread Sam James
commit: 24ba952b3ff906ee79987fcfb100ca495a23675d
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  5 05:57:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  5 05:57:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ba952b

sys-process/criu: add patch for >=dev-libs/protobuf-c-1.4.0

Could be adapted to earlier versions in theory.

Closes: https://bugs.gentoo.org/809092
Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.15-r1.ebuild   | 140 +
 .../criu/files/criu-3.15-protobuf-c-1.4.0.patch| 168 +
 2 files changed, 308 insertions(+)

diff --git a/sys-process/criu/criu-3.15-r1.ebuild 
b/sys-process/criu/criu-3.15-r1.ebuild
new file mode 100644
index 000..bb76d9a19d3
--- /dev/null
+++ b/sys-process/criu/criu-3.15-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit toolchain-funcs linux-info python-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 ~ppc64"
+IUSE="doc selinux setproctitle static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=dev-libs/protobuf-c-1.4.0:=
+   dev-libs/libnl:3
+   net-libs/libnet:1.1
+   sys-libs/libcap
+   selinux? ( sys-libs/libselinux )
+   setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? (
+   app-text/asciidoc
+   app-text/xmlto
+   )"
+RDEPEND="${RDEPEND}
+   dev-python/protobuf-python[${PYTHON_USEDEP}]"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL 
~INOTIFY_USER
+   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+   "${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
+   "${FILESDIR}"/${PN}-3.15-pkg-config.patch
+   "${FILESDIR}"/${PN}-3.15-protobuf-c-1.4.0.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";;
+   ppc64*) echo "ppc64";;
+   *) echo "${ARCH}";;
+   esac
+}
+
+pkg_setup() {
+   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+   linux-info_pkg_setup
+}
+
+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
+
+   # Build system uses this variable as a trigger to append coverage flags
+   # we'd like to avoid it. https://bugs.gentoo.org/744244
+   unset GCOV
+
+   python_setup
+}
+
+src_compile() {
+   local target="all $(usex doc 'docs' '')"
+   emake \
+   HOSTCC="$(tc-getBUILD_CC)" \
+   CC="$(tc-getCC)" \
+   LD="$(tc-getLD)" \
+   AR="$(tc-getAR)" \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+   PYTHON="${EPYTHON%.?}" \
+   FULL_PYTHON="${PYTHON%.?}" \
+   OBJCOPY="$(tc-getOBJCOPY)" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   ARCH="$(criu_arch)" \
+   V=1 WERROR=0 DEBUG=0 \
+   SETPROCTITLE=$(usex setproctitle) \
+   ${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() {
+   "${EPYTHON}" scripts/crit-setup.py install --root="${D}" 
--prefix="${EPREFIX}/usr/" || die
+   python_optimize
+}
+
+src_install() {
+   emake \
+   ARCH="$(criu_arch)" \
+   PREFIX="${EPREFIX}"/usr \
+   PYTHON="${EPYTHON%.?}" \
+   FULL_PYTHON="${PYTHON%.?}" \
+   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
+
+   python_foreach_impl install_crit
+
+   if ! use static-libs; then
+   find "${D}" -n

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2021-09-02 Thread Sam James
commit: 903af3f4f5ac45e80dff33f8647281855e0ac1e0
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  2 21:14:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  2 23:52:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903af3f4

sys-process/criu: [QA] fix UnusedInherits

Signed-off-by: Sam James  gentoo.org>

 sys-process/criu/criu-3.14-r2.ebuild | 4 ++--
 sys-process/criu/criu-3.15.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-process/criu/criu-3.14-r2.ebuild 
b/sys-process/criu/criu-3.14-r2.ebuild
index f37d6d72104..82a145ca725 100644
--- a/sys-process/criu/criu-3.14-r2.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..8} )
 
-inherit toolchain-funcs linux-info flag-o-matic python-r1
+inherit toolchain-funcs linux-info python-r1
 
 DESCRIPTION="utility to checkpoint/restore a process tree"
 HOMEPAGE="https://criu.org/";

diff --git a/sys-process/criu/criu-3.15.ebuild 
b/sys-process/criu/criu-3.15.ebuild
index 204e5a4facc..79c927987e0 100644
--- a/sys-process/criu/criu-3.15.ebuild
+++ b/sys-process/criu/criu-3.15.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit toolchain-funcs linux-info flag-o-matic python-r1
+inherit toolchain-funcs linux-info python-r1
 
 DESCRIPTION="utility to checkpoint/restore a process tree"
 HOMEPAGE="https://criu.org/";



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2021-07-19 Thread Georgy Yakovlev
commit: 0e10a0b6f7e778e763c37d745220f23a70ef3756
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jul 20 00:49:17 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jul 20 00:49:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e10a0b6

sys-process/criu: stabilize 3.15 for ppc64

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-process/criu/criu-3.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.15.ebuild 
b/sys-process/criu/criu-3.15.ebuild
index 065124a7e5d..204e5a4facc 100644
--- a/sys-process/criu/criu-3.15.ebuild
+++ b/sys-process/criu/criu-3.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ppc64"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/

2021-06-16 Thread Mike Frysinger
commit: d79e10b274201dad47a013ed29a1420877a37ba7
Author: Mike Frysinger  chromium  org>
AuthorDate: Wed Jun 16 19:50:43 2021 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Jun 16 20:09:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79e10b2

sys-process/criu: fix $PKG_CONFIG usage

Needed to properly cross-compile.

Signed-off-by: Mike Frysinger  gentoo.org>

 sys-process/criu/criu-3.15.ebuild |   2 +
 sys-process/criu/files/criu-3.15-pkg-config.patch | 141 ++
 2 files changed, 143 insertions(+)

diff --git a/sys-process/criu/criu-3.15.ebuild 
b/sys-process/criu/criu-3.15.ebuild
index b9e42cf4fa5..065124a7e5d 100644
--- a/sys-process/criu/criu-3.15.ebuild
+++ b/sys-process/criu/criu-3.15.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
"${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
+   "${FILESDIR}"/${PN}-3.15-pkg-config.patch
 )
 
 criu_arch() {
@@ -93,6 +94,7 @@ src_compile() {
CC="$(tc-getCC)" \
LD="$(tc-getLD)" \
AR="$(tc-getAR)" \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
PYTHON="${EPYTHON%.?}" \
FULL_PYTHON="${PYTHON%.?}" \
OBJCOPY="$(tc-getOBJCOPY)" \

diff --git a/sys-process/criu/files/criu-3.15-pkg-config.patch 
b/sys-process/criu/files/criu-3.15-pkg-config.patch
new file mode 100644
index 000..69d83bfc399
--- /dev/null
+++ b/sys-process/criu/files/criu-3.15-pkg-config.patch
@@ -0,0 +1,141 @@
+https://github.com/checkpoint-restore/criu/pull/1517
+
+From d72536d9a821f9ff64f5dd62c9f8a282e3e5ec85 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Wed, 16 Jun 2021 15:43:04 -0400
+Subject: [PATCH] build: respect $PKG_CONFIG settings
+
+The build needs to respect $PKG_CONFIG env var like other standard
+build systems and the the upstream pkg-config project itself.  This
+allows the package builder to point it to the right tool when doing
+a cross-compile build.  Otherwise the host pkg-config tool is used
+which won't have access to the packages in the cross sysroot.
+
+Signed-off-by: Mike Frysinger 
+---
+ Makefile.config  | 2 +-
+ criu/Makefile| 2 +-
+ scripts/nmk/scripts/tools.mk | 1 +
+ scripts/nmk/scripts/utils.mk | 2 +-
+ test/zdtm/Makefile.inc   | 8 +---
+ test/zdtm/lib/Makefile   | 2 +-
+ test/zdtm/static/Makefile| 2 +-
+ 7 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.config b/Makefile.config
+index 3d99e680be7f..6e3e1b062256 100644
+--- a/Makefile.config
 b/Makefile.config
+@@ -30,7 +30,7 @@ else
+ endif
+ 
+ ifeq ($(call pkg-config-check,libnftables),y)
+-LIB_NFTABLES  := $(shell pkg-config --libs libnftables)
++LIB_NFTABLES  := $(shell $(PKG_CONFIG) --libs libnftables)
+ ifeq ($(call 
try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
+ LIBS_FEATURES += $(LIB_NFTABLES)
+ FEATURE_DEFINES   += -DCONFIG_HAS_NFTABLES_LIB_API_0
+diff --git a/criu/Makefile b/criu/Makefile
+index ceb49ce09925..11d454c81026 100644
+--- a/criu/Makefile
 b/criu/Makefile
+@@ -27,7 +27,7 @@ CFLAGS   += -iquote include
+ CFLAGS+= -iquote images
+ CFLAGS+= -iquote $(ARCH_DIR)/include
+ CFLAGS+= -iquote .
+-CFLAGS+= $(shell pkg-config --cflags libnl-3.0)
++CFLAGS+= $(shell $(PKG_CONFIG) --cflags libnl-3.0)
+ CFLAGS+= $(CONFIG-DEFINES)
+ 
+ ifeq ($(GMON),1)
+diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
+index c5794401c734..1681d4e9092b 100644
+--- a/scripts/nmk/scripts/tools.mk
 b/scripts/nmk/scripts/tools.mk
+@@ -17,6 +17,7 @@ AR   := $(CROSS_COMPILE)ar
+ STRIP := $(CROSS_COMPILE)strip
+ OBJCOPY   := $(CROSS_COMPILE)objcopy
+ OBJDUMP   := $(CROSS_COMPILE)objdump
++PKG_CONFIG?= pkg-config
+ NM:= $(CROSS_COMPILE)nm
+ MAKE  := make
+ MKDIR := mkdir -p
+diff --git a/scripts/nmk/scripts/utils.mk b/scripts/nmk/scripts/utils.mk
+index b9790615ca7f..f93fdf911cef 100644
+--- a/scripts/nmk/scripts/utils.mk
 b/scripts/nmk/scripts/utils.mk
+@@ -16,7 +16,7 @@ try-asm = $(call 
try-compile,assembler-with-cpp,$(1),$(2),$(3))
+ 
+ # pkg-config-check
+ # Usage: ifeq ($(call pkg-config-check, library),y)
+-pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
++pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
+ 
+ #
+ # Remove duplicates.
+diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
+index 43763321f956..e4af9c51e9e4 100644
+--- a/test/zdtm/Makefile.inc
 b/test/zdtm/Makefile.inc
+@@ -37,6 +37,7 @@ HOSTCC   ?= gcc
+ ifeq ($(origin CC), default)
+ CC := $(CROSS_COMPILE)$(

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2021-05-31 Thread Agostino Sarubbo
commit: 75e8d97698c2716fa676cdd9ca50b7d3140ce681
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  1 06:31:01 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  1 06:31:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e8d976

sys-process/criu: amd64 stable wrt bug #793371

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-process/criu/criu-3.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/criu/criu-3.15.ebuild 
b/sys-process/criu/criu-3.15.ebuild
index bf1a3adc34c..b9e42cf4fa5 100644
--- a/sys-process/criu/criu-3.15.ebuild
+++ b/sys-process/criu/criu-3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2020-11-24 Thread Patrick McLean
commit: 444567e130d35a09a866626727df2921860111ef
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Nov 25 03:45:41 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Nov 25 03:45:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444567e1

sys-process/criu-3.15: Version bump

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Patrick McLean  gentoo.org>

 sys-process/criu/Manifest |   1 +
 sys-process/criu/criu-3.15.ebuild | 137 ++
 2 files changed, 138 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index dc1a71857ab..84332204a0a 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1 +1,2 @@
 DIST criu-3.14.tar.bz2 881407 BLAKE2B 
418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b
 SHA512 
97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb3be398911cc2c995310b17cc6
+DIST criu-3.15.tar.bz2 913904 BLAKE2B 
2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159
 SHA512 
7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc

diff --git a/sys-process/criu/criu-3.15.ebuild 
b/sys-process/criu/criu-3.15.ebuild
new file mode 100644
index 000..4ea6dc9f39a
--- /dev/null
+++ b/sys-process/criu/criu-3.15.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit toolchain-funcs linux-info flag-o-matic python-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 ~ppc64"
+IUSE="doc selinux setproctitle static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/protobuf-c
+   dev-libs/libnl:3
+   net-libs/libnet:1.1
+   sys-libs/libcap
+   selinux? ( sys-libs/libselinux )
+   setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+   doc? (
+   app-text/asciidoc
+   app-text/xmlto
+   )"
+RDEPEND="${RDEPEND}
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL 
~INOTIFY_USER
+   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
+
+# root access required for tests
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+   "${FILESDIR}"/${PN}-3.12-automagic-libbsd.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";;
+   ppc64*) echo "ppc64";;
+   *) echo "${ARCH}";;
+   esac
+}
+
+pkg_setup() {
+   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+   linux-info_pkg_setup
+}
+
+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
+
+   # Build system uses this variable as a trigger to append coverage flags
+   # we'd like to avoid it. https://bugs.gentoo.org/744244
+   unset GCOV
+
+   python_setup
+}
+
+src_compile() {
+   local target="all $(usex doc 'docs' '')"
+   emake \
+   HOSTCC="$(tc-getBUILD_CC)" \
+   CC="$(tc-getCC)" \
+   LD="$(tc-getLD)" \
+   AR="$(tc-getAR)" \
+   PYTHON="${EPYTHON%.?}" \
+   FULL_PYTHON="${PYTHON%.?}" \
+   OBJCOPY="$(tc-getOBJCOPY)" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   ARCH="$(criu_arch)" \
+   V=1 WERROR=0 DEBUG=0 \
+   SETPROCTITLE=$(usex setproctitle) \
+   ${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() {
+   "${EPYTHON}" scripts/crit-setup.py install --root="${D}" 
--prefix="${EPREFIX}/usr/" || die
+   python_optimize
+}
+
+src_install() {
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/2.5/, sys-process/criu/files/2.0/, ...

2020-09-25 Thread Michał Górny
commit: d3f90abc513aeec17cadea530fd786b5482b6369
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 25 08:54:01 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep 25 10:19:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f90abc

sys-process/criu: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 sys-process/criu/Manifest  |   3 -
 sys-process/criu/criu-3.11.ebuild  | 125 -
 sys-process/criu/criu-3.12.ebuild  | 125 -
 sys-process/criu/criu-3.6.ebuild   | 113 ---
 sys-process/criu/files/2.0/criu-2.0-sysroot.patch  |   9 --
 sys-process/criu/files/2.3/criu-2.3-aarch64.patch  |  22 
 sys-process/criu/files/2.4/criu-2.4-makefile.patch |  78 -
 .../criu/files/2.5/criu-2.5-automagic-libbsd.patch |  17 ---
 .../criu/files/criu-2.8-automagic-libbsd.patch |  17 ---
 sys-process/criu/files/criu-3.12-gcc-10.patch  |  76 -
 10 files changed, 585 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 7ebc2ced395..dc1a71857ab 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,4 +1 @@
-DIST criu-3.11.tar.bz2 809858 BLAKE2B 
873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e
 SHA512 
d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a
-DIST criu-3.12.tar.bz2 820168 BLAKE2B 
ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca
 SHA512 
bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0
 DIST criu-3.14.tar.bz2 881407 BLAKE2B 
418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b
 SHA512 
97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb3be398911cc2c995310b17cc6
-DIST criu-3.6.tar.bz2 739437 BLAKE2B 
0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f
 SHA512 
5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586

diff --git a/sys-process/criu/criu-3.11.ebuild 
b/sys-process/criu/criu-3.11.ebuild
deleted file mode 100644
index 97a9868b722..000
--- a/sys-process/criu/criu-3.11.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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
-
-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 

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2020-09-25 Thread Agostino Sarubbo
commit: 81d16be12da5be4235ef93159e7f28c5d588a9bf
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 25 08:45:32 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 25 08:45:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d16be1

sys-process/criu: amd64 stable wrt bug #738544

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-process/criu/criu-3.14-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.14-r2.ebuild 
b/sys-process/criu/criu-3.14-r2.ebuild
index 87fc935c2d6..2eeaf8f09f2 100644
--- a/sys-process/criu/criu-3.14-r2.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2020-09-24 Thread Georgy Yakovlev
commit: ae76b6469821f5685dd91b767f962c0ac06ef4b6
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Sep 24 08:28:32 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Sep 24 08:29:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae76b646

sys-process/criu: unset GCOV completely

Bug: https://bugs.gentoo.org/744244
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-process/criu/criu-3.14-r2.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.14-r2.ebuild 
b/sys-process/criu/criu-3.14-r2.ebuild
index aee154fafa4..87fc935c2d6 100644
--- a/sys-process/criu/criu-3.14-r2.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -79,6 +79,11 @@ 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
+
+   # Build system uses this variable as a trigger to append coverage flags
+   # we'd like to avoid it. https://bugs.gentoo.org/744244
+   unset GCOV
+
python_setup
 }
 
@@ -94,7 +99,7 @@ src_compile() {
OBJCOPY="$(tc-getOBJCOPY)" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
ARCH="$(criu_arch)" \
-   V=1 WERROR=0 DEBUG=0 GCOV= \
+   V=1 WERROR=0 DEBUG=0 \
SETPROCTITLE=$(usex setproctitle) \
${target}
 }



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2020-09-23 Thread Georgy Yakovlev
commit: 904c2e8deaacb84fd58d152cf18e0f6ab2c5d0c5
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Sep 24 01:52:26 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Sep 24 01:52:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904c2e8d

sys-process/criu: don't fail with non-empty GCOV envvar

Bug: https://bugs.gentoo.org/744244
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-process/criu/criu-3.14-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.14-r2.ebuild 
b/sys-process/criu/criu-3.14-r2.ebuild
index 0cab02a8774..aee154fafa4 100644
--- a/sys-process/criu/criu-3.14-r2.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -94,7 +94,7 @@ src_compile() {
OBJCOPY="$(tc-getOBJCOPY)" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
ARCH="$(criu_arch)" \
-   V=1 WERROR=0 DEBUG=0 \
+   V=1 WERROR=0 DEBUG=0 GCOV= \
SETPROCTITLE=$(usex setproctitle) \
${target}
 }



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2020-09-22 Thread Georgy Yakovlev
commit: 1db39caa60172f86d9f2c1d248e26c87f7ce5676
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Sep 22 08:29:20 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Sep 22 20:24:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1db39caa

sys-process/criu: revbump 3.14-r1, python no longer optional

python is no longer optional, criu target
requires crit, which requires pycriu.

also check for IA32 emulation only on amd64.

and remove RAW_LDFLAGS, it was added by patch
which is no longer applied to this version.
LDFLAGS still not honored, #728148

Closes: https://bugs.gentoo.org/735636
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../{criu-3.14-r1.ebuild => criu-3.14-r2.ebuild}   | 28 +++---
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys-process/criu/criu-3.14-r1.ebuild 
b/sys-process/criu/criu-3.14-r2.ebuild
similarity index 85%
rename from sys-process/criu/criu-3.14-r1.ebuild
rename to sys-process/criu/criu-3.14-r2.ebuild
index 17298a55f2c..0cab02a8774 100644
--- a/sys-process/criu/criu-3.14-r1.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -14,16 +14,16 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="doc python selinux setproctitle static-libs"
+IUSE="doc selinux setproctitle static-libs"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+   ${PYTHON_DEPS}
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}
@@ -32,14 +32,12 @@ DEPEND="${RDEPEND}
app-text/xmlto
)"
 RDEPEND="${RDEPEND}
-   python? (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   dev-python/ipaddr[${PYTHON_USEDEP}]
-   )"
+   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"
+   ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN 
~NETFILTER_XT_MARK"
 
 # root access required for tests
 RESTRICT="test"
@@ -60,6 +58,11 @@ criu_arch() {
esac
 }
 
+pkg_setup() {
+   use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION"
+   linux-info_pkg_setup
+}
+
 src_prepare() {
default
 
@@ -81,7 +84,7 @@ src_configure() {
 
 src_compile() {
local target="all $(usex doc 'docs' '')"
-   RAW_LDFLAGS="$(raw-ldflags)" emake \
+   emake \
HOSTCC="$(tc-getBUILD_CC)" \
CC="$(tc-getCC)" \
LD="$(tc-getLD)" \
@@ -93,7 +96,6 @@ src_compile() {
ARCH="$(criu_arch)" \
V=1 WERROR=0 DEBUG=0 \
SETPROCTITLE=$(usex setproctitle) \
-   PYCRIU=$(usex python) \
${target}
 }
 
@@ -123,9 +125,7 @@ src_install() {
 
use doc && dodoc CREDITS README.md
 
-   if use python ; then
-   python_foreach_impl install_crit
-   fi
+   python_foreach_impl install_crit
 
if ! use static-libs; then
find "${D}" -name "*.a" -delete || die



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2020-09-22 Thread Georgy Yakovlev
commit: f478ddaca7ccb72f0d7c943f85e6c75a32daadcb
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Sep 22 07:30:28 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Sep 22 20:24:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f478ddac

sys-process/criu: add ~ppc64 keyword

it works on ppc64le and is already masked on ppc/ppc64be

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-process/criu/criu-3.14-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.14-r1.ebuild 
b/sys-process/criu/criu-3.14-r1.ebuild
index c9f8ef9a81c..17298a55f2c 100644
--- a/sys-process/criu/criu-3.14-r1.ebuild
+++ b/sys-process/criu/criu-3.14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 IUSE="doc python selinux setproctitle static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -55,6 +55,7 @@ criu_arch() {
case ${ARCH} in
amd64) echo "x86";;
arm64) echo "aarch64";;
+   ppc64*) echo "ppc64";;
*) echo "${ARCH}";;
esac
 }



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2020-08-02 Thread Patrick McLean
commit: 8f4fa093b0da0b3781bb84cadbb0e723bc3db958
Author: Patrick McLean  gentoo  org>
AuthorDate: Sun Aug  2 17:37:04 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Sun Aug  2 17:37:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4fa093

sys-process/criu-3.14-r1: Don't install python2.7 code (bug 723872)

Closes: https://bugs.gentoo.org/723872
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Patrick McLean  gentoo.org>

 sys-process/criu/{criu-3.14.ebuild => criu-3.14-r1.ebuild} | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.14.ebuild 
b/sys-process/criu/criu-3.14-r1.ebuild
similarity index 94%
rename from sys-process/criu/criu-3.14.ebuild
rename to sys-process/criu/criu-3.14-r1.ebuild
index 9ffb3cc47e9..c9f8ef9a81c 100644
--- a/sys-process/criu/criu-3.14.ebuild
+++ b/sys-process/criu/criu-3.14-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit toolchain-funcs linux-info flag-o-matic python-r1
 
@@ -75,6 +75,7 @@ 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
+   python_setup
 }
 
 src_compile() {
@@ -84,6 +85,8 @@ src_compile() {
CC="$(tc-getCC)" \
LD="$(tc-getLD)" \
AR="$(tc-getAR)" \
+   PYTHON="${EPYTHON%.?}" \
+   FULL_PYTHON="${PYTHON%.?}" \
OBJCOPY="$(tc-getOBJCOPY)" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
ARCH="$(criu_arch)" \
@@ -109,6 +112,8 @@ src_install() {
emake \
ARCH="$(criu_arch)" \
PREFIX="${EPREFIX}"/usr \
+   PYTHON="${EPYTHON%.?}" \
+   FULL_PYTHON="${PYTHON%.?}" \
LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
DESTDIR="${D}" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2020-05-15 Thread Patrick McLean
commit: 04700d5b9b6e6b534c70212d8b124efa9572a208
Author: Patrick McLean  sony  com>
AuthorDate: Fri May 15 17:36:16 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri May 15 17:36:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04700d5b

sys-process/criu-3.14: Version bump, eapi=7, py3 (bug #713054)

Closes: https://bugs.gentoo.org/713054
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

 sys-process/criu/Manifest |   1 +
 sys-process/criu/criu-3.14.ebuild | 127 ++
 sys-process/criu/metadata.xml |   4 ++
 3 files changed, 132 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 3513936cd09..7ebc2ced395 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
 DIST criu-3.11.tar.bz2 809858 BLAKE2B 
873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e
 SHA512 
d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a
 DIST criu-3.12.tar.bz2 820168 BLAKE2B 
ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca
 SHA512 
bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0
+DIST criu-3.14.tar.bz2 881407 BLAKE2B 
418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b
 SHA512 
97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb3be398911cc2c995310b17cc6
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 
0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f
 SHA512 
5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586

diff --git a/sys-process/criu/criu-3.14.ebuild 
b/sys-process/criu/criu-3.14.ebuild
new file mode 100644
index 000..9ffb3cc47e9
--- /dev/null
+++ b/sys-process/criu/criu-3.14.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit toolchain-funcs linux-info flag-o-matic python-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"
+
+# root access required for tests
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+   "${FILESDIR}"/${PN}-3.12-automagic-libbsd.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 \
+   HOSTCC="$(tc-getBUILD_CC)" \
+   CC="$(tc-getCC)" \
+   LD="$(tc-getLD)" \
+   AR="$(tc-getAR)" \
+   OBJCOPY="$(tc-getOBJCOPY)" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   ARCH="$(cr

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2020-04-25 Thread Sergei Trofimovich
commit: 58bfbf51627caf280e9b644e5df8f4f0f35ffd54
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Apr 25 11:27:14 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Apr 25 11:29:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58bfbf51

sys-process/criu: tweak for gcc-10, bug #707942

Closes: https://bugs.gentoo.org/707942
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-process/criu/criu-3.12.ebuild |  3 +-
 sys-process/criu/files/criu-3.12-gcc-10.patch | 76 +++
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.12.ebuild 
b/sys-process/criu/criu-3.12.ebuild
index 9321be89fc0..7b5158f5f9b 100644
--- a/sys-process/criu/criu-3.12.ebuild
+++ b/sys-process/criu/criu-3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,7 @@ PATCHES=(
"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
"${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
+   "${FILESDIR}"/${PN}-3.12-gcc-10.patch # backport
 )
 
 criu_arch() {

diff --git a/sys-process/criu/files/criu-3.12-gcc-10.patch 
b/sys-process/criu/files/criu-3.12-gcc-10.patch
new file mode 100644
index 000..ff277b5b22d
--- /dev/null
+++ b/sys-process/criu/files/criu-3.12-gcc-10.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/707942
+
+From 10d9dcdb6e2fbe4646ff3f27cd35376ebaeeb0f9 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich 
+Date: Sun, 2 Feb 2020 18:45:59 +
+Subject: [PATCH] criu: fix build failure against gcc-10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+ld: criu/arch/x86/crtools.o:criu/include/cr_options.h:159:
+  multiple definition of `rpc_cfg_file'; 
criu/arch/x86/cpu.o:criu/include/cr_options.h:159: first defined here
+make[2]: *** [scripts/nmk/scripts/build.mk:164: 
criu/arch/x86/crtools.built-in.o] Error 1
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/707942
+Signed-off-by: Sergei Trofimovich 
+---
+ criu/config.c | 1 +
+ criu/include/cr_options.h | 2 +-
+ criu/include/pstree.h | 2 +-
+ criu/include/tun.h| 2 +-
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+--- a/criu/config.c
 b/criu/config.c
+@@ -30,6 +30,7 @@
+ #include "common/xmalloc.h"
+ 
+ struct cr_options opts;
++char *rpc_cfg_file;
+ 
+ static int count_elements(char **to_count)
+ {
+--- a/criu/include/cr_options.h
 b/criu/include/cr_options.h
+@@ -156,7 +156,7 @@ struct cr_options {
+ };
+ 
+ extern struct cr_options opts;
+-char *rpc_cfg_file;
++extern char *rpc_cfg_file;
+ 
+ extern int parse_options(int argc, char **argv, bool *usage_error, bool 
*has_exec_cmd, int state);
+ extern int check_options(void);
+--- a/criu/include/pstree.h
 b/criu/include/pstree.h
+@@ -42,7 +42,7 @@ enum {
+ };
+ #define FDS_EVENT (1 << FDS_EVENT_BIT)
+ 
+-struct pstree_item *current;
++extern struct pstree_item *current;
+ 
+ struct rst_info;
+ /* See alloc_pstree_item() for details */
+--- a/criu/include/tun.h
 b/criu/include/tun.h
+@@ -5,7 +5,7 @@
+ #define TUN_MINOR 200
+ #endif
+ 
+-struct ns_id *ns;
++extern struct ns_id *ns;
+ 
+ #include 
+ 



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2019-12-29 Thread David Seifert
commit: a8d5e6f0768df879d1463f2d14f0f4ee716b50aa
Author: David Seifert  gentoo  org>
AuthorDate: Sun Dec 29 09:55:28 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Dec 29 09:55:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d5e6f0

sys-process/criu: [QA] Remove explicit python-utils-r1 inherit

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 sys-process/criu/criu-3.11.ebuild | 2 +-
 sys-process/criu/criu-3.12.ebuild | 2 +-
 sys-process/criu/criu-3.6.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-process/criu/criu-3.11.ebuild 
b/sys-process/criu/criu-3.11.ebuild
index 09d8af6c2b8..97a9868b722 100644
--- a/sys-process/criu/criu-3.11.ebuild
+++ b/sys-process/criu/criu-3.11.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+inherit toolchain-funcs linux-info flag-o-matic python-r1
 
 DESCRIPTION="utility to checkpoint/restore a process tree"
 HOMEPAGE="https://criu.org/";

diff --git a/sys-process/criu/criu-3.12.ebuild 
b/sys-process/criu/criu-3.12.ebuild
index 9001e1cf751..9321be89fc0 100644
--- a/sys-process/criu/criu-3.12.ebuild
+++ b/sys-process/criu/criu-3.12.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+inherit toolchain-funcs linux-info flag-o-matic python-r1
 
 DESCRIPTION="utility to checkpoint/restore a process tree"
 HOMEPAGE="https://criu.org/";

diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild
index 5e41c3a8155..055d999d50a 100644
--- a/sys-process/criu/criu-3.6.ebuild
+++ b/sys-process/criu/criu-3.6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 
python-utils-r1
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1
 
 DESCRIPTION="utility to checkpoint/restore a process tree"
 HOMEPAGE="http://criu.org/";



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2019-10-19 Thread Yixun Lan
commit: 77ad984a9e9b48de8a0b7370722b6e6b44b4a2e3
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Oct 20 06:28:43 2019 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Oct 20 06:28:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ad984a

sys-process/criu: drop myself from maintainer list

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Yixun Lan  gentoo.org>

 sys-process/criu/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index 1a679807e0a..cba283f8ff9 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   d...@gentoo.org
-   Yixun Lan
-   

virtualizat...@gentoo.org
Gentoo Virtualization Project



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2019-07-28 Thread Matthias Maier
commit: a513ac76630b5c4dfe3b37d8757665292d0be101
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Jul 29 02:41:45 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Jul 29 02:43:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a513ac76

sys-process/criu: fix build

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier  gentoo.org>

 sys-process/criu/criu-3.12.ebuild   |  3 +--
 sys-process/criu/files/criu-3.12-automagic-libbsd.patch | 13 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-process/criu/criu-3.12.ebuild 
b/sys-process/criu/criu-3.12.ebuild
index 09d8af6c2b8..9001e1cf751 100644
--- a/sys-process/criu/criu-3.12.ebuild
+++ b/sys-process/criu/criu-3.12.ebuild
@@ -46,8 +46,7 @@ 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
+   "${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
 )
 
 criu_arch() {

diff --git a/sys-process/criu/files/criu-3.12-automagic-libbsd.patch 
b/sys-process/criu/files/criu-3.12-automagic-libbsd.patch
new file mode 100644
index 000..7794f82e519
--- /dev/null
+++ b/sys-process/criu/files/criu-3.12-automagic-libbsd.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.config b/Makefile.config
+index a853705..27bb91f 100644
+--- a/Makefile.config
 b/Makefile.config
+@@ -2,7 +2,7 @@ include $(__nmk_dir)utils.mk
+ include $(__nmk_dir)msg.mk
+ include scripts/feature-tests.mak
+ 
+-ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
++ifeq ($(SETPROCTITLE)$(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),yestrue)
+ LIBS_FEATURES += -lbsd
+ FEATURE_DEFINES   += -DCONFIG_HAS_LIBBSD
+ else



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2019-07-28 Thread Matthias Maier
commit: ec925c7eed41cd9b9e6a428ed708bf01c4712b43
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul 28 19:29:58 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul 28 19:38:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec925c7e

sys-process/criu: drop obsolete versions

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier  gentoo.org>

 sys-process/criu/Manifest   |   3 -
 sys-process/criu/criu-2.5-r1.ebuild |  96 ---
 sys-process/criu/criu-3.7.ebuild| 118 --
 sys-process/criu/criu-3.9.ebuild| 125 
 4 files changed, 342 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index d4f8006d4cb..3513936cd09 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,6 +1,3 @@
-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.12.tar.bz2 820168 BLAKE2B 
ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca
 SHA512 
bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0
 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

diff --git a/sys-process/criu/criu-2.5-r1.ebuild 
b/sys-process/criu/criu-2.5-r1.ebuild
deleted file mode 100644
index 8b7c7941be2..000
--- a/sys-process/criu/criu-2.5-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/protobuf-c
-   dev-libs/libnl:3
-   sys-libs/libcap
-   python? ( ${PYTHON_DEPS} )
-   setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-   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"
-
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-   "${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
-   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-   "${FILESDIR}"/2.5/${PN}-2.5-automagic-libbsd.patch
-   "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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=$(use

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2019-07-28 Thread Matthias Maier
commit: 9dad4e149404cb50b2d23022f819e2be5c41a138
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul 28 19:29:01 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul 28 19:38:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dad4e14

sys-process/criu: version bump to 3.12

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier  gentoo.org>

 sys-process/criu/Manifest |   1 +
 sys-process/criu/criu-3.12.ebuild | 125 ++
 2 files changed, 126 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 155dc853310..d4f8006d4cb 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,5 +1,6 @@
 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.12.tar.bz2 820168 BLAKE2B 
ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca
 SHA512 
bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0
 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

diff --git a/sys-process/criu/criu-3.12.ebuild 
b/sys-process/criu/criu-3.12.ebuild
new file mode 100644
index 000..09d8af6c2b8
--- /dev/null
+++ b/sys-process/criu/criu-3.12.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 in

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2019-03-02 Thread Sergei Trofimovich
commit: 75a2b2b36067e3dc0dbd999f6a886d4999884072
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar  2 09:56:48 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar  2 09:57:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a2b2b3

sys-process/criu: disable -Werror, bug #679140

gcc-8 detected new warnings and broke the build:
  compel/include/uapi/compel/asm/fpu.h:89:1: error:
alignment 1 of ‘struct xsave_struct_ia32’ is less than 16
  [-Werror=packed-not-aligned]

The change disables -Werror as we do in unstable ebuilds.

Reported-by: Thomas Beutin
Closes: https://bugs.gentoo.org/679140
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-process/criu/criu-3.6.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild
index 92f3e863605..5e41c3a8155 100644
--- a/sys-process/criu/criu-3.6.ebuild
+++ b/sys-process/criu/criu-3.6.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
@@ -97,6 +97,7 @@ src_install() {
LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
DESTDIR="${D}" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   WERROR=0 \
install
 
dodoc CREDITS README.md



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2019-01-12 Thread Sergei Trofimovich
commit: be5fcdcd8831ed6be0bbfcee2888799249a79b24
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jan 10 22:33:31 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 12 23:28:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5fcdcd

sys-process/criu: bump up to 3.11

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-process/criu/Manifest |   1 +
 sys-process/criu/criu-3.11.ebuild | 125 ++
 2 files changed, 126 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 00632afc4d0..155dc853310 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,4 +1,5 @@
 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

diff --git a/sys-process/criu/criu-3.11.ebuild 
b/sys-process/criu/criu-3.11.ebuild
new file mode 100644
index 000..09d8af6c2b8
--- /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)" \
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2019-01-12 Thread Sergei Trofimovich
commit: 9421f807aec9524b1f0d5dcd18bbb114cffefc34
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jan 10 22:31:42 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 12 23:28:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9421f807

sys-process/criu: don't pass -Werror in src_install() either

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-process/criu/criu-3.9.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.9.ebuild b/sys-process/criu/criu-3.9.ebuild
index 523a1b1c4e5..09d8af6c2b8 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



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/2.2/, sys-process/criu/files/2.9/, sys-process/criu/, ...

2018-06-25 Thread Virgil Dupras
commit: 453cc5abaf4c2a4778cfa56c06ba37d6f04ba6a7
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Jun 25 19:41:40 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Jun 25 19:44:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=453cc5ab

sys-process/criu: bump to v3.9

- Drop spurious patch files
- Drop spurious eutils inherit
- Add "doc" USE flag thanks to Troy C. See bug 622550
- Add missing kernel flag checks

Closes: https://bugs.gentoo.org/622550
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-process/criu/Manifest  |   1 +
 sys-process/criu/criu-3.9.ebuild   | 124 +
 .../criu/files/2.0/criu-2.0-automagic-libbsd.patch |  17 ---
 sys-process/criu/files/2.2/criu-2.2-makefile.patch |  77 -
 sys-process/criu/files/2.2/criu-2.2-no-git.patch   |  16 ---
 sys-process/criu/files/2.9/criu-2.9-makefile.patch |  78 -
 6 files changed, 125 insertions(+), 188 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 3cddefc4645..00632afc4d0 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
 DIST criu-2.5.tar.bz2 605226 BLAKE2B 
c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875
 SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 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

diff --git a/sys-process/criu/criu-3.9.ebuild b/sys-process/criu/criu-3.9.ebuild
new file mode 100644
index 000..523a1b1c4e5
--- /dev/null
+++ b/sys-process/criu/criu-3.9.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2018-05-06 Thread Mike Frysinger
commit: e0cd3d9f23b1d6caa25abcc9aaf4521c52dabc03
Author: Rahul Chaudhry  chromium  org>
AuthorDate: Mon May  7 06:35:51 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Mon May  7 06:37:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0cd3d9f

sys-process/criu: disable use of the gold linker

The criu build process uses a custom linker script that doesn't play
well the output of the gold linker leading to build failures.  Disable
gold for now to avoid this.

 sys-process/criu/criu-3.7.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/sys-process/criu/criu-3.7.ebuild b/sys-process/criu/criu-3.7.ebuild
index 1c2c80e5b56..9a72bb4c705 100644
--- a/sys-process/criu/criu-3.7.ebuild
+++ b/sys-process/criu/criu-3.7.ebuild
@@ -66,6 +66,12 @@ src_prepare() {
fi
 }
 
+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() {
RAW_LDFLAGS="$(raw-ldflags)" emake \
CC="$(tc-getCC)" \



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2018-04-30 Thread Mike Gilbert
commit: 929bdeeccda03557aa5a7278d3221830495d19b2
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Apr 30 15:15:58 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 30 15:39:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929bdeec

sys-process/criu: Clean dev-libs/protobuf dependencies.

 sys-process/criu/criu-2.5-r1.ebuild | 5 +
 sys-process/criu/criu-3.6.ebuild| 5 +
 sys-process/criu/criu-3.7.ebuild| 5 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/sys-process/criu/criu-2.5-r1.ebuild 
b/sys-process/criu/criu-2.5-r1.ebuild
index 71416acacc6..8b7c7941be2 100644
--- a/sys-process/criu/criu-2.5-r1.ebuild
+++ b/sys-process/criu/criu-2.5-r1.ebuild
@@ -27,10 +27,7 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   || (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
-   )
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 

diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild
index 857633f5045..92f3e863605 100644
--- a/sys-process/criu/criu-3.6.ebuild
+++ b/sys-process/criu/criu-3.6.ebuild
@@ -31,10 +31,7 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   || (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
-   )
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 

diff --git a/sys-process/criu/criu-3.7.ebuild b/sys-process/criu/criu-3.7.ebuild
index 34cf3149abc..1c2c80e5b56 100644
--- a/sys-process/criu/criu-3.7.ebuild
+++ b/sys-process/criu/criu-3.7.ebuild
@@ -31,10 +31,7 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   || (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
-   )
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2018-02-22 Thread Agostino Sarubbo
commit: 28581d6ca864179eb5de9a5efd9af7da69ac676c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Feb 22 09:03:10 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Feb 22 09:05:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28581d6c

sys-process/criu: amd64 stable wrt bug #647362

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 sys-process/criu/criu-3.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild
index b0ed466c0a8..857633f5045 100644
--- a/sys-process/criu/criu-3.6.ebuild
+++ b/sys-process/criu/criu-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="python selinux setproctitle static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/

2018-02-15 Thread Patrice Clement
commit: e8b4d478a8d7acbf48101683a785a3ec0836b3a7
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Feb 14 07:12:17 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Feb 15 14:27:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b4d478

sys-process/criu: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/7178

 .../criu/files/criu-2.12.1-glibc-2.26.patch| 49 --
 1 file changed, 49 deletions(-)

diff --git a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch 
b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
deleted file mode 100644
index d378cc88cff..000
--- a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d77d8cc402e597bb38edfb4e81db89fd7d96d0b6 Mon Sep 17 00:00:00 2001
-From: Adrian Reber 
-Date: Thu, 29 Jun 2017 14:19:32 +
-Subject: [PATCH] fix building with newer glibc
-
-Newer glibc releases have removed SIGUNUSED from bits/signum.h which
-breaks building criu on those systems:
-
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8082d91e1c449e0cb137468b731004a5e605c8c6
-
-SIGSYS returns the same value as SIGUNUSED and testing has shown
-that criu still successfully completes zdtm with this patch.
-
-Signed-off-by: Adrian Reber 
-Reviewed-by: Dmitry Safonov 
-Signed-off-by: Andrei Vagin 

- criu/cr-restore.c| 1 -
- test/zdtm/static/pthread01.c | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/criu/cr-restore.c b/criu/cr-restore.c
-index e8fb4adf..6ba50f18 100644
 a/criu/cr-restore.c
-+++ b/criu/cr-restore.c
-@@ -880,7 +880,6 @@ static void zombie_prepare_signals(void)
-   (1 << SIGPOLL)  |\
-   (1 << SIGIO)|\
-   (1 << SIGSYS)   |\
--  (1 << SIGUNUSED)|\
-   (1 << SIGSTKFLT)|\
-   (1 << SIGPWR)\
-   )
-diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c
-index 52f849c0..2520fcfe 100644
 a/test/zdtm/static/pthread01.c
-+++ b/test/zdtm/static/pthread01.c
-@@ -43,7 +43,7 @@ static char *decode_signal(const sigset_t *s, char *buf)
-   COLLECT(SIGTERM); COLLECT(SIGSTKFLT); COLLECT(SIGCHLD); 
COLLECT(SIGCONT); COLLECT(SIGSTOP);
-   COLLECT(SIGTSTP); COLLECT(SIGTTIN); COLLECT(SIGTTOU); COLLECT(SIGURG); 
COLLECT(SIGXCPU);
-   COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); 
COLLECT(SIGWINCH); COLLECT(SIGIO);
--  COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
-+  COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
- #undef COLLECT
- 
-   return buf;
--- 
-2.14.1
-



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2018-02-11 Thread Matthias Maier
commit: a57c229ec7536ff13cdcde46de64459b77ec438a
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Feb 12 02:58:00 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Feb 12 03:05:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57c229e

sys-process/criu: drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-process/criu/Manifest  |   2 -
 sys-process/criu/criu-2.12.1-r1.ebuild | 100 -
 sys-process/criu/criu-3.4-r1.ebuild|  98 
 3 files changed, 200 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 28132aecefe..863d68e8601 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,4 +1,2 @@
-DIST criu-2.12.1.tar.bz2 646855 BLAKE2B 
b3bb7fd7b9006dd60346639c0d86954fa083de3af8950810a642447dd2f0043fdd8c6df96cd2f5e55788c002dd2c0530f7379fb17a5e798dbdacc14227cd5ae7
 SHA512 
7a168bc20665ed3ca9931e6f2fa6d58b87faee38eee30dcdda8dad041ffd90ea7e1bad17d4dcf5c5d8de563eacc64ecbd579b7f4b959a654182a688e94024ba2
 DIST criu-2.5.tar.bz2 605226 BLAKE2B 
c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875
 SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
-DIST criu-3.4.tar.bz2 701680 BLAKE2B 
16cd6bde7f356322b979c14823d6f22ffc64a3104ca185c7407a97d7af9dc7a83bb538c86e7a93bb7d99c6a01eba309435d4e1e80033a90bf386d235871fca34
 SHA512 
71fc700d19b46381873b2d0fa90e7fa253b00beb5e4e6065bbf510766acbcc14b35d58fa8073801112f897d2320b7decca1115fb6853d5fe64f3c52aa40a9f32
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 
0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f
 SHA512 
5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586

diff --git a/sys-process/criu/criu-2.12.1-r1.ebuild 
b/sys-process/criu/criu-2.12.1-r1.ebuild
deleted file mode 100644
index bf72562e14c..000
--- a/sys-process/criu/criu-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-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} )
-   setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-   app-text/asciidoc
-   app-text/xmlto"
-RDEPEND="${RDEPEND}
-   python? (
-   || (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   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"
-
-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
-   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
-   "${FILESDIR}"/${PN}-2.12.1-glibc-2.26.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}"/et

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2018-02-11 Thread Matthias Maier
commit: f4156bb8f8372cb28944a2d04a3cf36f1125af89
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Feb 12 03:01:42 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Feb 12 03:05:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4156bb8

sys-process/criu: version bump to 3.7

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-process/criu/Manifest|   1 +
 sys-process/criu/criu-3.7.ebuild | 115 +++
 2 files changed, 116 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 863d68e8601..3cddefc4645 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,2 +1,3 @@
 DIST criu-2.5.tar.bz2 605226 BLAKE2B 
c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875
 SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 
0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f
 SHA512 
5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
+DIST criu-3.7.tar.bz2 749499 BLAKE2B 
41222983183910b8a039a69e1a425993703e4f461c1cc0e64e92f877aff571d56c7f32cdae7848ef1633a15cac9e7b746f8c84a71f3607f7fc22959964820258
 SHA512 
8feb9e2579c04b67a7fe9631bb662504a7eb78550c3951cbe29252d87d9258fd6994533f6e60b0017b6a6e21bbdd5e7cd7e8a255be53b77b57efacec4e50140f

diff --git a/sys-process/criu/criu-3.7.ebuild b/sys-process/criu/criu-3.7.ebuild
new file mode 100644
index 000..34cf3149abc
--- /dev/null
+++ b/sys-process/criu/criu-3.7.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 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}
+   app-text/asciidoc
+   app-text/xmlto"
+RDEPEND="${RDEPEND}
+   python? (
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   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"
+
+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
+}
+
+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
+   

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2018-01-21 Thread Zac Medico
commit: 9c7d03d22b3b20d80a30c56cf118d6b848341718
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Jan 22 01:37:02 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Jan 22 01:42:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7d03d2

sys-process/criu: revbumps for protobuf-python dep change

Since sys-apps/portage-2.3.20 defaults to --dynamic-deps=n, this revbump
is needed in order to correct the dependencies of installed instances of
criu.

Fixes: 11f24667f843 ("sys-process/criu: Depend on || ( 
dev-python/protobuf-python dev-libs/protobuf[python] ).")
Bug: https://bugs.gentoo.org/645310
Package-Manager: Portage-2.3.20, Repoman-2.3.6
RepoMan-Options: --force

 sys-process/criu/{criu-2.12.1.ebuild => criu-2.12.1-r1.ebuild} | 2 +-
 sys-process/criu/{criu-2.5.ebuild => criu-2.5-r1.ebuild}   | 2 +-
 sys-process/criu/{criu-3.4.ebuild => criu-3.4-r1.ebuild}   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-process/criu/criu-2.12.1.ebuild 
b/sys-process/criu/criu-2.12.1-r1.ebuild
similarity index 98%
rename from sys-process/criu/criu-2.12.1.ebuild
rename to sys-process/criu/criu-2.12.1-r1.ebuild
index dcaf87f2ca3..bf72562e14c 100644
--- a/sys-process/criu/criu-2.12.1.ebuild
+++ b/sys-process/criu/criu-2.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

diff --git a/sys-process/criu/criu-2.5.ebuild 
b/sys-process/criu/criu-2.5-r1.ebuild
similarity index 98%
rename from sys-process/criu/criu-2.5.ebuild
rename to sys-process/criu/criu-2.5-r1.ebuild
index c234bdc1508..71416acacc6 100644
--- a/sys-process/criu/criu-2.5.ebuild
+++ b/sys-process/criu/criu-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

diff --git a/sys-process/criu/criu-3.4.ebuild 
b/sys-process/criu/criu-3.4-r1.ebuild
similarity index 98%
rename from sys-process/criu/criu-3.4.ebuild
rename to sys-process/criu/criu-3.4-r1.ebuild
index 2aec9b89b4a..37f7bdf70e9 100644
--- a/sys-process/criu/criu-3.4.ebuild
+++ b/sys-process/criu/criu-3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-12-15 Thread Matthias Maier
commit: 85a6e8e3a710dd73641e28617c8708a75bcc6d4f
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Dec 15 23:48:26 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sat Dec 16 00:23:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a6e8e3

sys-process/criu: drop obsolete versions 2.1x

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 sys-process/criu/Manifest   |  4 --
 sys-process/criu/criu-2.10.ebuild   | 99 -
 sys-process/criu/criu-2.11.1.ebuild | 99 -
 sys-process/criu/criu-2.11.ebuild   | 99 -
 sys-process/criu/criu-2.12.ebuild   | 99 -
 5 files changed, 400 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index fdc48026b02..28132aecefe 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,8 +1,4 @@
-DIST criu-2.10.tar.bz2 640205 BLAKE2B 
ba9d061096faf28b2986f3426af7dff272281149c983a881728b7bb09ee4e3e958414b634fb696976826ad67142139ef1abf8152504fc62e3ecaf434c2afd7d8
 SHA512 
6e59ff8a97297583b9f7d31492f0ac59e217fe6372253584db7f9409a4d890104feb9caac663b17d036c39eb79621be6000a7d5e814b65ce5d151e0a053d324b
-DIST criu-2.11.1.tar.bz2 644358 BLAKE2B 
aee7945055504706da520c9306cd0e0dec95f9beb704548b8ac1ab6ef38f363ece6da5f0bbcb98e4ac0f63e9000666774f7947eb4bfd863280cbd22b654f3dab
 SHA512 
2f4a8d19bda1a73ac2f769c327af5aba5903d28547d46361e5124c9a81c76d0cd73c03180aefabdcb9511f0523f982ec99e2657b6ff46b92ac655ede9fdffd97
-DIST criu-2.11.tar.bz2 645048 BLAKE2B 
81f145973fec2696b3359bebeb4ba1f5d56a6e14249cc840da04d89ae1cdb06db3ab314295e68d4d4ca8d53bf90f980aefd440f3518b9438ad491a6f7d64a366
 SHA512 
fba02203c95841909e3d7178b09dd6075fff1e9913ad12ac2aca43aef6e6565fc4f822a5a0dcb3cb146d15c57f0a9c17d6e645375aa3922f93108dfb2477f867
 DIST criu-2.12.1.tar.bz2 646855 BLAKE2B 
b3bb7fd7b9006dd60346639c0d86954fa083de3af8950810a642447dd2f0043fdd8c6df96cd2f5e55788c002dd2c0530f7379fb17a5e798dbdacc14227cd5ae7
 SHA512 
7a168bc20665ed3ca9931e6f2fa6d58b87faee38eee30dcdda8dad041ffd90ea7e1bad17d4dcf5c5d8de563eacc64ecbd579b7f4b959a654182a688e94024ba2
-DIST criu-2.12.tar.bz2 646770 BLAKE2B 
d0e442cf75e2981f7055fdecd52f7c75027279f2f5711acdbd43e0918e3dd535c22d4f7606304985e94adb4f0d94f8c44438f8447493e85ab407df905c4939f4
 SHA512 
e021772c5d42dd93fe0d6c10a7aa731b600871ba78772169323c661c59d00f4d78ceda3ddfbda76123947f6ff6d2c19e443bb73e018a649e7f3872b73d28763a
 DIST criu-2.5.tar.bz2 605226 BLAKE2B 
c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875
 SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 DIST criu-3.4.tar.bz2 701680 BLAKE2B 
16cd6bde7f356322b979c14823d6f22ffc64a3104ca185c7407a97d7af9dc7a83bb538c86e7a93bb7d99c6a01eba309435d4e1e80033a90bf386d235871fca34
 SHA512 
71fc700d19b46381873b2d0fa90e7fa253b00beb5e4e6065bbf510766acbcc14b35d58fa8073801112f897d2320b7decca1115fb6853d5fe64f3c52aa40a9f32
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 
0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f
 SHA512 
5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586

diff --git a/sys-process/criu/criu-2.10.ebuild 
b/sys-process/criu/criu-2.10.ebuild
deleted file mode 100644
index 8478ddd0274..000
--- a/sys-process/criu/criu-2.10.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-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} )
-   setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-   app-text/asciidoc
-   app-text/xmlto"
-RDEPEND="${RDEPEND}
-   python? (
-   || (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   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"
-
-PATCHES=(
-   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-   "${FILESDIR}"/2.3/${P

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/

2017-12-12 Thread Matthias Maier
commit: 08d720a1c7dfa5d87c02d6321245a3d3e502fbe2
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Nov 19 12:53:11 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Dec 12 17:05:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d720a1

sys-process/criu: remove unused patch

Signed-off-by: Matthias Maier  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/6235

 sys-process/criu/files/criu-2.8-sysmacros.patch | 98 -
 1 file changed, 98 deletions(-)

diff --git a/sys-process/criu/files/criu-2.8-sysmacros.patch 
b/sys-process/criu/files/criu-2.8-sysmacros.patch
deleted file mode 100644
index 68bba802f4e..000
--- a/sys-process/criu/files/criu-2.8-sysmacros.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-https://bugs.gentoo.org/580454
-https://github.com/xemul/criu/pull/257
-
-From 6913c0004eaa4fd11bf3efc8c37fb05108cf18ee Mon Sep 17 00:00:00 2001
-From: Yixun Lan 
-Date: Wed, 7 Dec 2016 00:24:42 -0500
-Subject: [PATCH] include sys/sysmacros.h for minor/major/makedev funcs
-
-Since glibc is moving away from implicitly including sys/sysmacros.h
-all the time via sys/types.h, include the header directly in more
-places.  This seems to cover most makedev/major/minor usage.
-
-Signed-off-by: Yixun Lan 
-Signed-off-by: Mike Frysinger 

- criu/file-lock.c   | 1 +
- criu/include/util.h| 1 +
- criu/kerndat.c | 1 +
- criu/proc_parse.c  | 1 +
- test/zdtm/lib/fs.h | 1 +
- test/zdtm/static/console.c | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/criu/file-lock.c b/criu/file-lock.c
-index 1ab1e5886965..11d8a194937a 100644
 a/criu/file-lock.c
-+++ b/criu/file-lock.c
-@@ -5,6 +5,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "cr_options.h"
- #include "imgset.h"
-diff --git a/criu/include/util.h b/criu/include/util.h
-index 8eaee33391c5..1aa40e863acb 100644
 a/criu/include/util.h
-+++ b/criu/include/util.h
-@@ -10,6 +10,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- #include "int.h"
-diff --git a/criu/kerndat.c b/criu/kerndat.c
-index f9675bd7ec1d..aeef1b7f6640 100644
 a/criu/kerndat.c
-+++ b/criu/kerndat.c
-@@ -7,6 +7,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "int.h"
- #include "log.h"
-diff --git a/criu/proc_parse.c b/criu/proc_parse.c
-index 3f84cdaad99a..a86d31769ded 100644
 a/criu/proc_parse.c
-+++ b/criu/proc_parse.c
-@@ -9,6 +9,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "types.h"
- #include "common/list.h"
-diff --git a/test/zdtm/lib/fs.h b/test/zdtm/lib/fs.h
-index 972c49b4a068..972b15abad0c 100644
 a/test/zdtm/lib/fs.h
-+++ b/test/zdtm/lib/fs.h
-@@ -6,6 +6,7 @@
- #endif
- 
- #include 
-+#include 
- 
- #include 
- 
-diff --git a/test/zdtm/static/console.c b/test/zdtm/static/console.c
-index a86b14639729..41246aea0298 100644
 a/test/zdtm/static/console.c
-+++ b/test/zdtm/static/console.c
-@@ -8,6 +8,7 @@
- 
- #include 
- #include 
-+#include 
- 
- #include "zdtmtst.h"
- 
--- 
-2.11.0.rc2
-



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-11-12 Thread Justin Lecher
commit: 650df73029f572640645c696911385a9ec57982a
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Nov 12 20:56:16 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov 12 21:08:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650df730

sys-process/criu: Version Bump

handle automagic dep in selinux

Signed-off-by: Justin Lecher  gentoo.org>
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 sys-process/criu/Manifest|   1 +
 sys-process/criu/criu-3.6.ebuild | 115 +++
 2 files changed, 116 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 3a5845f0c3c..84358d544f7 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -5,3 +5,4 @@ DIST criu-2.12.1.tar.bz2 646855 SHA256 
33e4f575a533b66e0571fff0c2b6ced51612789fa
 DIST criu-2.12.tar.bz2 646770 SHA256 
b707eee3410a833b2d5d7534557c7a21f800f10d8660966d1efdd6396f1a1e4b SHA512 
e021772c5d42dd93fe0d6c10a7aa731b600871ba78772169323c661c59d00f4d78ceda3ddfbda76123947f6ff6d2c19e443bb73e018a649e7f3872b73d28763a
 WHIRLPOOL 
19017b586cf5a490393c8b3b3d9ca98f6aa5442812cf4eb8bca45efa7f04c2360d7cbd46c40f1abf84ee6ba82ff2ecc6256f54d553259783a2ba4c36aa7dbaad
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-3.4.tar.bz2 701680 SHA256 
876bf32b9351c0034ff8f7064a6e63487f6639aedec115356cc76c436fa437c2 SHA512 
71fc700d19b46381873b2d0fa90e7fa253b00beb5e4e6065bbf510766acbcc14b35d58fa8073801112f897d2320b7decca1115fb6853d5fe64f3c52aa40a9f32
 WHIRLPOOL 
39be8e58635f21868f152a50f163875812d1325212b0c0c5a360152869e03358eb449b86700ee6f242cb890fcf5217c2aceaf3b2781e3b2d7c70ecc1a6c933df
+DIST criu-3.6.tar.bz2 739437 SHA256 
de1d612fdf020c34f5cb2932c88e9e330ae1e4c6547b31b81d6d9b2da7bb2ca3 SHA512 
5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
 WHIRLPOOL 
89f93cd908a597276e88a9e337353d7f088abb60331737cafcf2b2f1450b025e8452690530c731cae86dcada500d7cde1d846d792a589d4c8806ecb15d76b762

diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild
new file mode 100644
index 000..b0ed466c0a8
--- /dev/null
+++ b/sys-process/criu/criu-3.6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 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}
+   app-text/asciidoc
+   app-text/xmlto"
+RDEPEND="${RDEPEND}
+   python? (
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   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"
+
+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
+}
+
+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 pyth

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-09-21 Thread Mike Gilbert
commit: 11f24667f843745a0a81b124d29d1e7b1bf91333
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Sep 21 05:19:30 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 21 21:03:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f24667

sys-process/criu: Depend on || ( dev-python/protobuf-python 
dev-libs/protobuf[python] ).

 sys-process/criu/criu-2.10.ebuild   | 5 -
 sys-process/criu/criu-2.11.1.ebuild | 5 -
 sys-process/criu/criu-2.11.ebuild   | 5 -
 sys-process/criu/criu-2.12.1.ebuild | 5 -
 sys-process/criu/criu-2.12.ebuild   | 5 -
 sys-process/criu/criu-2.5.ebuild| 5 -
 sys-process/criu/criu-3.4.ebuild| 5 -
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/sys-process/criu/criu-2.10.ebuild 
b/sys-process/criu/criu-2.10.ebuild
index fd0c92becf6..8478ddd0274 100644
--- a/sys-process/criu/criu-2.10.ebuild
+++ b/sys-process/criu/criu-2.10.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 

diff --git a/sys-process/criu/criu-2.11.1.ebuild 
b/sys-process/criu/criu-2.11.1.ebuild
index fd0c92becf6..8478ddd0274 100644
--- a/sys-process/criu/criu-2.11.1.ebuild
+++ b/sys-process/criu/criu-2.11.1.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 

diff --git a/sys-process/criu/criu-2.11.ebuild 
b/sys-process/criu/criu-2.11.ebuild
index fd0c92becf6..8478ddd0274 100644
--- a/sys-process/criu/criu-2.11.ebuild
+++ b/sys-process/criu/criu-2.11.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 

diff --git a/sys-process/criu/criu-2.12.1.ebuild 
b/sys-process/criu/criu-2.12.1.ebuild
index 76b63750a52..dcaf87f2ca3 100644
--- a/sys-process/criu/criu-2.12.1.ebuild
+++ b/sys-process/criu/criu-2.12.1.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 

diff --git a/sys-process/criu/criu-2.12.ebuild 
b/sys-process/criu/criu-2.12.ebuild
index fd0c92becf6..8478ddd0274 100644
--- a/sys-process/criu/criu-2.12.ebuild
+++ b/sys-process/criu/criu-2.12.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 

diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild
index ed448fa13e2..c234bdc1508 100644
--- a/sys-process/criu/criu-2.5.ebuild
+++ b/sys-process/criu/criu-2.5.ebuild
@@ -27,7 +27,10 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
dev-python/ipaddr[${PYTHON_USEDEP}]
)"
 

diff --git a/sys-process/criu/criu-3.4.ebuild b/sys-process/criu/criu-3.4.ebuild
index 982954a66c3..2aec9b89b4a 100644
--- a/sys-process/criu/criu-3.4.ebuild
+++ b/sys-process/criu/criu-3.4.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
app-text/xmlto"
 RDEPEND="${RDEPEND}
python? (
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
dev-python/ipaddr[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/2.0/, sys-process/criu/

2017-09-01 Thread Sergei Trofimovich
commit: b29089547c85046ff7e411853e077553b3b55f92
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep  1 21:57:18 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep  1 21:57:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2908954

sys-process/criu: bump up to 3.4

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-process/criu/Manifest |  1 +
 sys-process/criu/criu-3.4.ebuild  | 95 +++
 sys-process/criu/files/2.0/criu-2.0-sysroot.patch |  8 +-
 3 files changed, 97 insertions(+), 7 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 09eee815d90..3a5845f0c3c 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -4,3 +4,4 @@ DIST criu-2.11.tar.bz2 645048 SHA256 
5f270222ba5e98b33aab7cef61363a11167fec96cf2
 DIST criu-2.12.1.tar.bz2 646855 SHA256 
33e4f575a533b66e0571fff0c2b6ced51612789fa3b944b841ec6fc79ed4a0a2 SHA512 
7a168bc20665ed3ca9931e6f2fa6d58b87faee38eee30dcdda8dad041ffd90ea7e1bad17d4dcf5c5d8de563eacc64ecbd579b7f4b959a654182a688e94024ba2
 WHIRLPOOL 
9889ea1e37da4a4425aede6c0408ea8dd0f315d5575d76709f055dc5b054aba4ee96107fa2417ff4a9d4028f5e009b085ef6884ead4f10cc2263ddf06cd13308
 DIST criu-2.12.tar.bz2 646770 SHA256 
b707eee3410a833b2d5d7534557c7a21f800f10d8660966d1efdd6396f1a1e4b SHA512 
e021772c5d42dd93fe0d6c10a7aa731b600871ba78772169323c661c59d00f4d78ceda3ddfbda76123947f6ff6d2c19e443bb73e018a649e7f3872b73d28763a
 WHIRLPOOL 
19017b586cf5a490393c8b3b3d9ca98f6aa5442812cf4eb8bca45efa7f04c2360d7cbd46c40f1abf84ee6ba82ff2ecc6256f54d553259783a2ba4c36aa7dbaad
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
+DIST criu-3.4.tar.bz2 701680 SHA256 
876bf32b9351c0034ff8f7064a6e63487f6639aedec115356cc76c436fa437c2 SHA512 
71fc700d19b46381873b2d0fa90e7fa253b00beb5e4e6065bbf510766acbcc14b35d58fa8073801112f897d2320b7decca1115fb6853d5fe64f3c52aa40a9f32
 WHIRLPOOL 
39be8e58635f21868f152a50f163875812d1325212b0c0c5a360152869e03358eb449b86700ee6f242cb890fcf5217c2aceaf3b2781e3b2d7c70ecc1a6c933df

diff --git a/sys-process/criu/criu-3.4.ebuild b/sys-process/criu/criu-3.4.ebuild
new file mode 100644
index 000..982954a66c3
--- /dev/null
+++ b/sys-process/criu/criu-3.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+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} )
+   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"
+
+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_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/"
+}

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/

2017-09-01 Thread Sergei Trofimovich
commit: 6b9c2bf74ae78ff90e7ab87393210acfab1e5b71
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep  1 07:35:20 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep  1 07:35:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b9c2bf7

sys-process/criu: fix build failure against glibc-2.26

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-process/criu/criu-2.12.1.ebuild|  1 +
 .../criu/files/criu-2.12.1-glibc-2.26.patch| 49 ++
 2 files changed, 50 insertions(+)

diff --git a/sys-process/criu/criu-2.12.1.ebuild 
b/sys-process/criu/criu-2.12.1.ebuild
index fd0c92becf6..76b63750a52 100644
--- a/sys-process/criu/criu-2.12.1.ebuild
+++ b/sys-process/criu/criu-2.12.1.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
+   "${FILESDIR}"/${PN}-2.12.1-glibc-2.26.patch
 )
 
 criu_arch() {

diff --git a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch 
b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
new file mode 100644
index 000..d378cc88cff
--- /dev/null
+++ b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
@@ -0,0 +1,49 @@
+From d77d8cc402e597bb38edfb4e81db89fd7d96d0b6 Mon Sep 17 00:00:00 2001
+From: Adrian Reber 
+Date: Thu, 29 Jun 2017 14:19:32 +
+Subject: [PATCH] fix building with newer glibc
+
+Newer glibc releases have removed SIGUNUSED from bits/signum.h which
+breaks building criu on those systems:
+
+https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8082d91e1c449e0cb137468b731004a5e605c8c6
+
+SIGSYS returns the same value as SIGUNUSED and testing has shown
+that criu still successfully completes zdtm with this patch.
+
+Signed-off-by: Adrian Reber 
+Reviewed-by: Dmitry Safonov 
+Signed-off-by: Andrei Vagin 
+---
+ criu/cr-restore.c| 1 -
+ test/zdtm/static/pthread01.c | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/criu/cr-restore.c b/criu/cr-restore.c
+index e8fb4adf..6ba50f18 100644
+--- a/criu/cr-restore.c
 b/criu/cr-restore.c
+@@ -880,7 +880,6 @@ static void zombie_prepare_signals(void)
+   (1 << SIGPOLL)  |\
+   (1 << SIGIO)|\
+   (1 << SIGSYS)   |\
+-  (1 << SIGUNUSED)|\
+   (1 << SIGSTKFLT)|\
+   (1 << SIGPWR)\
+   )
+diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c
+index 52f849c0..2520fcfe 100644
+--- a/test/zdtm/static/pthread01.c
 b/test/zdtm/static/pthread01.c
+@@ -43,7 +43,7 @@ static char *decode_signal(const sigset_t *s, char *buf)
+   COLLECT(SIGTERM); COLLECT(SIGSTKFLT); COLLECT(SIGCHLD); 
COLLECT(SIGCONT); COLLECT(SIGSTOP);
+   COLLECT(SIGTSTP); COLLECT(SIGTTIN); COLLECT(SIGTTOU); COLLECT(SIGURG); 
COLLECT(SIGXCPU);
+   COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); 
COLLECT(SIGWINCH); COLLECT(SIGIO);
+-  COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
++  COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
+ #undef COLLECT
+ 
+   return buf;
+-- 
+2.14.1
+



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-05-26 Thread David Seifert
commit: 419a35b293bf88fdc0ff0d1a69036e6f6dab64cd
Author: David Seifert  gentoo  org>
AuthorDate: Fri May 26 22:49:45 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri May 26 22:54:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419a35b2

sys-process/criu: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-process/criu/criu-2.10.ebuild   | 1 +
 sys-process/criu/criu-2.11.1.ebuild | 1 +
 sys-process/criu/criu-2.11.ebuild   | 1 +
 sys-process/criu/criu-2.12.1.ebuild | 1 +
 sys-process/criu/criu-2.12.ebuild   | 1 +
 sys-process/criu/criu-2.5.ebuild| 3 ++-
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-2.10.ebuild 
b/sys-process/criu/criu-2.10.ebuild
index 8c982903f88..fd0c92becf6 100644
--- a/sys-process/criu/criu-2.10.ebuild
+++ b/sys-process/criu/criu-2.10.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
dev-libs/libnl:3

diff --git a/sys-process/criu/criu-2.11.1.ebuild 
b/sys-process/criu/criu-2.11.1.ebuild
index 8c982903f88..fd0c92becf6 100644
--- a/sys-process/criu/criu-2.11.1.ebuild
+++ b/sys-process/criu/criu-2.11.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
dev-libs/libnl:3

diff --git a/sys-process/criu/criu-2.11.ebuild 
b/sys-process/criu/criu-2.11.ebuild
index 8c982903f88..fd0c92becf6 100644
--- a/sys-process/criu/criu-2.11.ebuild
+++ b/sys-process/criu/criu-2.11.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
dev-libs/libnl:3

diff --git a/sys-process/criu/criu-2.12.1.ebuild 
b/sys-process/criu/criu-2.12.1.ebuild
index 8c982903f88..fd0c92becf6 100644
--- a/sys-process/criu/criu-2.12.1.ebuild
+++ b/sys-process/criu/criu-2.12.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
dev-libs/libnl:3

diff --git a/sys-process/criu/criu-2.12.ebuild 
b/sys-process/criu/criu-2.12.ebuild
index 8c982903f88..fd0c92becf6 100644
--- a/sys-process/criu/criu-2.12.ebuild
+++ b/sys-process/criu/criu-2.12.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
dev-libs/libnl:3

diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild
index c36c8b55666..ed448fa13e2 100644
--- a/sys-process/criu/criu-2.5.ebuild
+++ b/sys-process/criu/criu-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64"
 IUSE="python setproctitle"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/protobuf-c
dev-libs/libnl:3



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-03-29 Thread Yixun Lan
commit: 1141c91b251b30acb26838da4afe8019189713a2
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Mar 30 06:32:10 2017 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Mar 30 06:32:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1141c91b

sys-process/criu: version bump 2.12.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-process/criu/Manifest   |  1 +
 sys-process/criu/criu-2.12.1.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 22cab85982f..09eee815d90 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,5 +1,6 @@
 DIST criu-2.10.tar.bz2 640205 SHA256 
05359b9def8abfc5967911325791a93468ce889f0f489949f925b371c143260d SHA512 
6e59ff8a97297583b9f7d31492f0ac59e217fe6372253584db7f9409a4d890104feb9caac663b17d036c39eb79621be6000a7d5e814b65ce5d151e0a053d324b
 WHIRLPOOL 
6d9dbd92941122256041dfe9f8d3c42e125808845904135631758a8474f10488c29f7881ecf56e05c6b8ba2baf7c4749eb3e17e1f9b510f37ded58741fcf2753
 DIST criu-2.11.1.tar.bz2 644358 SHA256 
c5f9236d706af8d2afb1e625c7da12b4ce64d923a772739d3cddb37d29517bea SHA512 
2f4a8d19bda1a73ac2f769c327af5aba5903d28547d46361e5124c9a81c76d0cd73c03180aefabdcb9511f0523f982ec99e2657b6ff46b92ac655ede9fdffd97
 WHIRLPOOL 
510d2bb8800bd7bbefd31e131143b2792009d705d111f439aa20dcab2c4aa2f0b125baaf12277749ec880e7ad9d693290966aeddae409cdd61d1113b9e9277db
 DIST criu-2.11.tar.bz2 645048 SHA256 
5f270222ba5e98b33aab7cef61363a11167fec96cf2f87e8a4a325d071e1b9ce SHA512 
fba02203c95841909e3d7178b09dd6075fff1e9913ad12ac2aca43aef6e6565fc4f822a5a0dcb3cb146d15c57f0a9c17d6e645375aa3922f93108dfb2477f867
 WHIRLPOOL 
f367093dfe9db1fe22ac028924143941c7ff48280f1b13b0ac0e8657f484a7634b3637ea1de2342ae5e0310e73aa8cad72c81b7100fb4df53e10c37ad3918dc0
+DIST criu-2.12.1.tar.bz2 646855 SHA256 
33e4f575a533b66e0571fff0c2b6ced51612789fa3b944b841ec6fc79ed4a0a2 SHA512 
7a168bc20665ed3ca9931e6f2fa6d58b87faee38eee30dcdda8dad041ffd90ea7e1bad17d4dcf5c5d8de563eacc64ecbd579b7f4b959a654182a688e94024ba2
 WHIRLPOOL 
9889ea1e37da4a4425aede6c0408ea8dd0f315d5575d76709f055dc5b054aba4ee96107fa2417ff4a9d4028f5e009b085ef6884ead4f10cc2263ddf06cd13308
 DIST criu-2.12.tar.bz2 646770 SHA256 
b707eee3410a833b2d5d7534557c7a21f800f10d8660966d1efdd6396f1a1e4b SHA512 
e021772c5d42dd93fe0d6c10a7aa731b600871ba78772169323c661c59d00f4d78ceda3ddfbda76123947f6ff6d2c19e443bb73e018a649e7f3872b73d28763a
 WHIRLPOOL 
19017b586cf5a490393c8b3b3d9ca98f6aa5442812cf4eb8bca45efa7f04c2360d7cbd46c40f1abf84ee6ba82ff2ecc6256f54d553259783a2ba4c36aa7dbaad
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62

diff --git a/sys-process/criu/criu-2.12.1.ebuild 
b/sys-process/criu/criu-2.12.1.ebuild
new file mode 100644
index 000..8c982903f88
--- /dev/null
+++ b/sys-process/criu/criu-2.12.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+   net-libs/libnet:1.1
+   sys-libs/libcap
+   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"
+
+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
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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)" \
+

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-03-09 Thread Yixun Lan
commit: 37d9a0339653009ff87f513fb89796ceebb12d47
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Mar 10 07:38:35 2017 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Mar 10 07:49:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37d9a033

sys-process/criu: version bump 2.12

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sys-process/criu/Manifest |  1 +
 sys-process/criu/criu-2.12.ebuild | 95 +++
 2 files changed, 96 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index f30ff712e5c..d9f1afdcf0f 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,6 +1,7 @@
 DIST criu-2.10.tar.bz2 640205 SHA256 
05359b9def8abfc5967911325791a93468ce889f0f489949f925b371c143260d SHA512 
6e59ff8a97297583b9f7d31492f0ac59e217fe6372253584db7f9409a4d890104feb9caac663b17d036c39eb79621be6000a7d5e814b65ce5d151e0a053d324b
 WHIRLPOOL 
6d9dbd92941122256041dfe9f8d3c42e125808845904135631758a8474f10488c29f7881ecf56e05c6b8ba2baf7c4749eb3e17e1f9b510f37ded58741fcf2753
 DIST criu-2.11.1.tar.bz2 644358 SHA256 
c5f9236d706af8d2afb1e625c7da12b4ce64d923a772739d3cddb37d29517bea SHA512 
2f4a8d19bda1a73ac2f769c327af5aba5903d28547d46361e5124c9a81c76d0cd73c03180aefabdcb9511f0523f982ec99e2657b6ff46b92ac655ede9fdffd97
 WHIRLPOOL 
510d2bb8800bd7bbefd31e131143b2792009d705d111f439aa20dcab2c4aa2f0b125baaf12277749ec880e7ad9d693290966aeddae409cdd61d1113b9e9277db
 DIST criu-2.11.tar.bz2 645048 SHA256 
5f270222ba5e98b33aab7cef61363a11167fec96cf2f87e8a4a325d071e1b9ce SHA512 
fba02203c95841909e3d7178b09dd6075fff1e9913ad12ac2aca43aef6e6565fc4f822a5a0dcb3cb146d15c57f0a9c17d6e645375aa3922f93108dfb2477f867
 WHIRLPOOL 
f367093dfe9db1fe22ac028924143941c7ff48280f1b13b0ac0e8657f484a7634b3637ea1de2342ae5e0310e73aa8cad72c81b7100fb4df53e10c37ad3918dc0
+DIST criu-2.12.tar.bz2 646770 SHA256 
b707eee3410a833b2d5d7534557c7a21f800f10d8660966d1efdd6396f1a1e4b SHA512 
e021772c5d42dd93fe0d6c10a7aa731b600871ba78772169323c661c59d00f4d78ceda3ddfbda76123947f6ff6d2c19e443bb73e018a649e7f3872b73d28763a
 WHIRLPOOL 
19017b586cf5a490393c8b3b3d9ca98f6aa5442812cf4eb8bca45efa7f04c2360d7cbd46c40f1abf84ee6ba82ff2ecc6256f54d553259783a2ba4c36aa7dbaad
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
 DIST criu-2.7.tar.bz2 618653 SHA256 
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512 
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
 WHIRLPOOL 
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a

diff --git a/sys-process/criu/criu-2.12.ebuild 
b/sys-process/criu/criu-2.12.ebuild
new file mode 100644
index 000..8c982903f88
--- /dev/null
+++ b/sys-process/criu/criu-2.12.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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
+   net-libs/libnet:1.1
+   sys-libs/libcap
+   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"
+
+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
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
+)
+
+criu_arch() {
+   # criu infers th

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-03-09 Thread Yixun Lan
commit: 11502bf1ecd834690dedd8b06eb538239a2bee57
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Mar 10 07:41:11 2017 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Mar 10 07:49:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11502bf1

sys-process/criu: drop old

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sys-process/criu/Manifest|  4 --
 sys-process/criu/criu-2.6.ebuild | 95 ---
 sys-process/criu/criu-2.7.ebuild | 95 ---
 sys-process/criu/criu-2.8.ebuild | 96 
 sys-process/criu/criu-2.9.ebuild | 95 ---
 5 files changed, 385 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index d9f1afdcf0f..22cab85982f 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -3,7 +3,3 @@ DIST criu-2.11.1.tar.bz2 644358 SHA256 
c5f9236d706af8d2afb1e625c7da12b4ce64d923a
 DIST criu-2.11.tar.bz2 645048 SHA256 
5f270222ba5e98b33aab7cef61363a11167fec96cf2f87e8a4a325d071e1b9ce SHA512 
fba02203c95841909e3d7178b09dd6075fff1e9913ad12ac2aca43aef6e6565fc4f822a5a0dcb3cb146d15c57f0a9c17d6e645375aa3922f93108dfb2477f867
 WHIRLPOOL 
f367093dfe9db1fe22ac028924143941c7ff48280f1b13b0ac0e8657f484a7634b3637ea1de2342ae5e0310e73aa8cad72c81b7100fb4df53e10c37ad3918dc0
 DIST criu-2.12.tar.bz2 646770 SHA256 
b707eee3410a833b2d5d7534557c7a21f800f10d8660966d1efdd6396f1a1e4b SHA512 
e021772c5d42dd93fe0d6c10a7aa731b600871ba78772169323c661c59d00f4d78ceda3ddfbda76123947f6ff6d2c19e443bb73e018a649e7f3872b73d28763a
 WHIRLPOOL 
19017b586cf5a490393c8b3b3d9ca98f6aa5442812cf4eb8bca45efa7f04c2360d7cbd46c40f1abf84ee6ba82ff2ecc6256f54d553259783a2ba4c36aa7dbaad
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
-DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
-DIST criu-2.7.tar.bz2 618653 SHA256 
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512 
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
 WHIRLPOOL 
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a
-DIST criu-2.8.tar.bz2 623257 SHA256 
54d77ee2bd31fb900395eeeda8cd653b334dbeb6594f3c3220d8c9e9f55d21f6 SHA512 
cc85cec1fd9dc543e2ab24356f33424bd3b962db6da273db85cd1f1e21d08b12d2b937fe673d369b2d2e2b2aaacb4967e00b67ea811f5318028522a55a892454
 WHIRLPOOL 
39d083f6d3197c9c8ee52b430b053ff372df0860e28850a4893e19ab9721e562a604adac0d8ecb9529ff7931e7ea05b10e771d187f9ed908b70916530f951fad
-DIST criu-2.9.tar.bz2 627584 SHA256 
21d1493e71b76fc0219a4274ca98332de3910cdd2e93070dc283ae4fc01421c9 SHA512 
ba8d43927a52c2a781921ee9b47db69e19d9ca6f3b80a55b2ebd1139fbe43d93202ea6e19a469ddfaaf4a31e2c37dfc9b59074c209a232c5398c28f1bcc4dc9d
 WHIRLPOOL 
1974aef132de2ae5d22e6714709f786557af13cdc8b351da4312ca7b98f3aa524c7358e592d8d1b0a3287e505703a6b1e93638db01008c4b3e4f63b725c26d0a

diff --git a/sys-process/criu/criu-2.6.ebuild b/sys-process/criu/criu-2.6.ebuild
deleted file mode 100644
index 34fce85fa81..000
--- a/sys-process/criu/criu-2.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-   sys-libs/libcap
-   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"
-
-PATCHES=(
-   "${FILESDI

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-02-22 Thread Yixun Lan
commit: e07d0eb3fbfec7c9c7ca302aad30e6e1467589e8
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Feb 22 03:56:55 2017 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Feb 22 09:08:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e07d0eb3

sys-process/criu: version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-process/criu/Manifest   |  1 +
 sys-process/criu/criu-2.11.1.ebuild | 96 +
 2 files changed, 97 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index a0b45cdc42..f30ff712e5 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,4 +1,5 @@
 DIST criu-2.10.tar.bz2 640205 SHA256 
05359b9def8abfc5967911325791a93468ce889f0f489949f925b371c143260d SHA512 
6e59ff8a97297583b9f7d31492f0ac59e217fe6372253584db7f9409a4d890104feb9caac663b17d036c39eb79621be6000a7d5e814b65ce5d151e0a053d324b
 WHIRLPOOL 
6d9dbd92941122256041dfe9f8d3c42e125808845904135631758a8474f10488c29f7881ecf56e05c6b8ba2baf7c4749eb3e17e1f9b510f37ded58741fcf2753
+DIST criu-2.11.1.tar.bz2 644358 SHA256 
c5f9236d706af8d2afb1e625c7da12b4ce64d923a772739d3cddb37d29517bea SHA512 
2f4a8d19bda1a73ac2f769c327af5aba5903d28547d46361e5124c9a81c76d0cd73c03180aefabdcb9511f0523f982ec99e2657b6ff46b92ac655ede9fdffd97
 WHIRLPOOL 
510d2bb8800bd7bbefd31e131143b2792009d705d111f439aa20dcab2c4aa2f0b125baaf12277749ec880e7ad9d693290966aeddae409cdd61d1113b9e9277db
 DIST criu-2.11.tar.bz2 645048 SHA256 
5f270222ba5e98b33aab7cef61363a11167fec96cf2f87e8a4a325d071e1b9ce SHA512 
fba02203c95841909e3d7178b09dd6075fff1e9913ad12ac2aca43aef6e6565fc4f822a5a0dcb3cb146d15c57f0a9c17d6e645375aa3922f93108dfb2477f867
 WHIRLPOOL 
f367093dfe9db1fe22ac028924143941c7ff48280f1b13b0ac0e8657f484a7634b3637ea1de2342ae5e0310e73aa8cad72c81b7100fb4df53e10c37ad3918dc0
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4

diff --git a/sys-process/criu/criu-2.11.1.ebuild 
b/sys-process/criu/criu-2.11.1.ebuild
new file mode 100644
index 00..e006547d82
--- /dev/null
+++ b/sys-process/criu/criu-2.11.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+   net-libs/libnet:1.1
+   sys-libs/libcap
+   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"
+
+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
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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
+   

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-02-15 Thread Yixun Lan
commit: abd922150c384926fb3dd4bf36478e9433a2f5fe
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Feb 15 21:42:29 2017 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Feb 15 21:45:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd92215

sys-process/criu: version bump, 2.11

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-process/criu/Manifest |  1 +
 sys-process/criu/criu-2.11.ebuild | 96 +++
 2 files changed, 97 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 37ffe947ea..a0b45cdc42 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,4 +1,5 @@
 DIST criu-2.10.tar.bz2 640205 SHA256 
05359b9def8abfc5967911325791a93468ce889f0f489949f925b371c143260d SHA512 
6e59ff8a97297583b9f7d31492f0ac59e217fe6372253584db7f9409a4d890104feb9caac663b17d036c39eb79621be6000a7d5e814b65ce5d151e0a053d324b
 WHIRLPOOL 
6d9dbd92941122256041dfe9f8d3c42e125808845904135631758a8474f10488c29f7881ecf56e05c6b8ba2baf7c4749eb3e17e1f9b510f37ded58741fcf2753
+DIST criu-2.11.tar.bz2 645048 SHA256 
5f270222ba5e98b33aab7cef61363a11167fec96cf2f87e8a4a325d071e1b9ce SHA512 
fba02203c95841909e3d7178b09dd6075fff1e9913ad12ac2aca43aef6e6565fc4f822a5a0dcb3cb146d15c57f0a9c17d6e645375aa3922f93108dfb2477f867
 WHIRLPOOL 
f367093dfe9db1fe22ac028924143941c7ff48280f1b13b0ac0e8657f484a7634b3637ea1de2342ae5e0310e73aa8cad72c81b7100fb4df53e10c37ad3918dc0
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
 DIST criu-2.7.tar.bz2 618653 SHA256 
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512 
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
 WHIRLPOOL 
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a

diff --git a/sys-process/criu/criu-2.11.ebuild 
b/sys-process/criu/criu-2.11.ebuild
new file mode 100644
index 00..e006547d82
--- /dev/null
+++ b/sys-process/criu/criu-2.11.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+   net-libs/libnet:1.1
+   sys-libs/libcap
+   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"
+
+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
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2017-01-18 Thread Yixun Lan
commit: ada359c76cd9c01ba4a2b675f26884960c03c2a2
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Jan 19 01:46:40 2017 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Jan 19 01:47:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada359c7

sys-process/criu: version bump 2.10

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-process/criu/Manifest |  1 +
 sys-process/criu/criu-2.10.ebuild | 96 +++
 2 files changed, 97 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 7120b09..37ffe94 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
+DIST criu-2.10.tar.bz2 640205 SHA256 
05359b9def8abfc5967911325791a93468ce889f0f489949f925b371c143260d SHA512 
6e59ff8a97297583b9f7d31492f0ac59e217fe6372253584db7f9409a4d890104feb9caac663b17d036c39eb79621be6000a7d5e814b65ce5d151e0a053d324b
 WHIRLPOOL 
6d9dbd92941122256041dfe9f8d3c42e125808845904135631758a8474f10488c29f7881ecf56e05c6b8ba2baf7c4749eb3e17e1f9b510f37ded58741fcf2753
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
 DIST criu-2.7.tar.bz2 618653 SHA256 
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512 
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
 WHIRLPOOL 
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a

diff --git a/sys-process/criu/criu-2.10.ebuild 
b/sys-process/criu/criu-2.10.ebuild
new file mode 100644
index ..e006547
--- /dev/null
+++ b/sys-process/criu/criu-2.10.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+   net-libs/libnet:1.1
+   sys-libs/libcap
+   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"
+
+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
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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 \
+   DES

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.9/

2016-12-20 Thread Yixun Lan
commit: 063e59b9f8fe894995b8514523f2c6b69a4efc72
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Dec 20 22:49:32 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Dec 20 22:51:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063e59b9

sys-process/criu: version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-process/criu/Manifest  |  1 +
 sys-process/criu/criu-2.9.ebuild   | 96 ++
 sys-process/criu/files/2.9/criu-2.9-makefile.patch | 78 ++
 3 files changed, 175 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4384ba9..7120b09 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,3 +2,4 @@ DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f13
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
 DIST criu-2.7.tar.bz2 618653 SHA256 
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512 
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
 WHIRLPOOL 
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a
 DIST criu-2.8.tar.bz2 623257 SHA256 
54d77ee2bd31fb900395eeeda8cd653b334dbeb6594f3c3220d8c9e9f55d21f6 SHA512 
cc85cec1fd9dc543e2ab24356f33424bd3b962db6da273db85cd1f1e21d08b12d2b937fe673d369b2d2e2b2aaacb4967e00b67ea811f5318028522a55a892454
 WHIRLPOOL 
39d083f6d3197c9c8ee52b430b053ff372df0860e28850a4893e19ab9721e562a604adac0d8ecb9529ff7931e7ea05b10e771d187f9ed908b70916530f951fad
+DIST criu-2.9.tar.bz2 627584 SHA256 
21d1493e71b76fc0219a4274ca98332de3910cdd2e93070dc283ae4fc01421c9 SHA512 
ba8d43927a52c2a781921ee9b47db69e19d9ca6f3b80a55b2ebd1139fbe43d93202ea6e19a469ddfaaf4a31e2c37dfc9b59074c209a232c5398c28f1bcc4dc9d
 WHIRLPOOL 
1974aef132de2ae5d22e6714709f786557af13cdc8b351da4312ca7b98f3aa524c7358e592d8d1b0a3287e505703a6b1e93638db01008c4b3e4f63b725c26d0a

diff --git a/sys-process/criu/criu-2.9.ebuild b/sys-process/criu/criu-2.9.ebuild
new file mode 100644
index ..779320c
--- /dev/null
+++ b/sys-process/criu/criu-2.9.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+   sys-libs/libcap
+   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"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.9/${PN}-2.9-makefile.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
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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/"
+}
+
+sr

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-12-20 Thread Tobias Klausmann
commit: 27cf8ff399b71e88d98c5ad070798cb609cb01cf
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Dec 20 19:18:56 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Dec 20 19:18:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27cf8ff3

sys-process/criu-2.5-r0: stable on amd64

Gentoo-Bug: 596810

 sys-process/criu/criu-2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild
index 3f163d5..697d067 100644
--- a/sys-process/criu/criu-2.5.ebuild
+++ b/sys-process/criu/criu-2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="python setproctitle"
 
 RDEPEND="dev-libs/protobuf-c



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2016-12-06 Thread Mike Frysinger
commit: 94e0974c2fa5702886fdf83a3a24dd18f77c3a6a
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Dec  7 05:27:51 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Dec  7 05:27:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94e0974c

sys-process/criu: fix build w/newer glibc #580454

 sys-process/criu/criu-2.8.ebuild|  1 +
 sys-process/criu/files/criu-2.8-sysmacros.patch | 98 +
 2 files changed, 99 insertions(+)

diff --git a/sys-process/criu/criu-2.8.ebuild b/sys-process/criu/criu-2.8.ebuild
index 343f811..b16c810 100644
--- a/sys-process/criu/criu-2.8.ebuild
+++ b/sys-process/criu/criu-2.8.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
+   "${FILESDIR}"/${P}-sysmacros.patch #580454
 )
 
 criu_arch() {

diff --git a/sys-process/criu/files/criu-2.8-sysmacros.patch 
b/sys-process/criu/files/criu-2.8-sysmacros.patch
new file mode 100644
index ..68bba80
--- /dev/null
+++ b/sys-process/criu/files/criu-2.8-sysmacros.patch
@@ -0,0 +1,98 @@
+https://bugs.gentoo.org/580454
+https://github.com/xemul/criu/pull/257
+
+From 6913c0004eaa4fd11bf3efc8c37fb05108cf18ee Mon Sep 17 00:00:00 2001
+From: Yixun Lan 
+Date: Wed, 7 Dec 2016 00:24:42 -0500
+Subject: [PATCH] include sys/sysmacros.h for minor/major/makedev funcs
+
+Since glibc is moving away from implicitly including sys/sysmacros.h
+all the time via sys/types.h, include the header directly in more
+places.  This seems to cover most makedev/major/minor usage.
+
+Signed-off-by: Yixun Lan 
+Signed-off-by: Mike Frysinger 
+---
+ criu/file-lock.c   | 1 +
+ criu/include/util.h| 1 +
+ criu/kerndat.c | 1 +
+ criu/proc_parse.c  | 1 +
+ test/zdtm/lib/fs.h | 1 +
+ test/zdtm/static/console.c | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/criu/file-lock.c b/criu/file-lock.c
+index 1ab1e5886965..11d8a194937a 100644
+--- a/criu/file-lock.c
 b/criu/file-lock.c
+@@ -5,6 +5,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "cr_options.h"
+ #include "imgset.h"
+diff --git a/criu/include/util.h b/criu/include/util.h
+index 8eaee33391c5..1aa40e863acb 100644
+--- a/criu/include/util.h
 b/criu/include/util.h
+@@ -10,6 +10,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "int.h"
+diff --git a/criu/kerndat.c b/criu/kerndat.c
+index f9675bd7ec1d..aeef1b7f6640 100644
+--- a/criu/kerndat.c
 b/criu/kerndat.c
+@@ -7,6 +7,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "int.h"
+ #include "log.h"
+diff --git a/criu/proc_parse.c b/criu/proc_parse.c
+index 3f84cdaad99a..a86d31769ded 100644
+--- a/criu/proc_parse.c
 b/criu/proc_parse.c
+@@ -9,6 +9,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "types.h"
+ #include "common/list.h"
+diff --git a/test/zdtm/lib/fs.h b/test/zdtm/lib/fs.h
+index 972c49b4a068..972b15abad0c 100644
+--- a/test/zdtm/lib/fs.h
 b/test/zdtm/lib/fs.h
+@@ -6,6 +6,7 @@
+ #endif
+ 
+ #include 
++#include 
+ 
+ #include 
+ 
+diff --git a/test/zdtm/static/console.c b/test/zdtm/static/console.c
+index a86b14639729..41246aea0298 100644
+--- a/test/zdtm/static/console.c
 b/test/zdtm/static/console.c
+@@ -8,6 +8,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #include "zdtmtst.h"
+ 
+-- 
+2.11.0.rc2
+



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

2016-11-23 Thread Yixun Lan
commit: 6369c31cbec6e0f4fde716eec69757801817c795
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Nov 23 10:04:14 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Nov 23 10:04:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6369c31c

sys-process/criu: version bump

Package-Manager: portage-2.3.2

 sys-process/criu/Manifest  |  1 +
 sys-process/criu/criu-2.8.ebuild   | 96 ++
 .../criu/files/criu-2.8-automagic-libbsd.patch | 17 
 3 files changed, 114 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 586fcb2..4384ba9 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
 DIST criu-2.7.tar.bz2 618653 SHA256 
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512 
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
 WHIRLPOOL 
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a
+DIST criu-2.8.tar.bz2 623257 SHA256 
54d77ee2bd31fb900395eeeda8cd653b334dbeb6594f3c3220d8c9e9f55d21f6 SHA512 
cc85cec1fd9dc543e2ab24356f33424bd3b962db6da273db85cd1f1e21d08b12d2b937fe673d369b2d2e2b2aaacb4967e00b67ea811f5318028522a55a892454
 WHIRLPOOL 
39d083f6d3197c9c8ee52b430b053ff372df0860e28850a4893e19ab9721e562a604adac0d8ecb9529ff7931e7ea05b10e771d187f9ed908b70916530f951fad

diff --git a/sys-process/criu/criu-2.8.ebuild b/sys-process/criu/criu-2.8.ebuild
new file mode 100644
index ..343f811
--- /dev/null
+++ b/sys-process/criu/criu-2.8.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+   sys-libs/libcap
+   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"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.4/${PN}-2.4-makefile.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
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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 \
+

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-10-18 Thread Yixun Lan
commit: bbe156567c74969e3b958a8a15cb2e4b7e22409c
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Oct 18 20:49:11 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Oct 18 20:49:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe15656

sys-process/criu: drop old

Package-Manager: portage-2.3.2

 sys-process/criu/Manifest|  1 -
 sys-process/criu/criu-2.4.ebuild | 95 
 2 files changed, 96 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 11b038f..586fcb2 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,4 +1,3 @@
-DIST criu-2.4.tar.bz2 602896 SHA256 
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
 WHIRLPOOL 
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
 DIST criu-2.7.tar.bz2 618653 SHA256 
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512 
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
 WHIRLPOOL 
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a

diff --git a/sys-process/criu/criu-2.4.ebuild b/sys-process/criu/criu-2.4.ebuild
deleted file mode 100644
index e17b58a..
--- a/sys-process/criu/criu-2.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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"
-
-PATCHES=(
-   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-   "${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
-   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-   "${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
-   "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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}" \
- 

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-10-18 Thread Yixun Lan
commit: bd4e88fd0d6079b5c634fe9911871fb41dc68ba6
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Oct 18 20:47:35 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Oct 18 20:49:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4e88fd

sys-process/criu: version bump 2.7

Package-Manager: portage-2.3.2

 sys-process/criu/Manifest|  1 +
 sys-process/criu/criu-2.7.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index d16c4b5..11b038f 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
 DIST criu-2.4.tar.bz2 602896 SHA256 
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
 WHIRLPOOL 
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4
+DIST criu-2.7.tar.bz2 618653 SHA256 
c9aae64a4d2a6e881225ec14a00527aef228171a11227034b6322c126c2ece04 SHA512 
fb80c3d48116489775e23231e93e6385614b57bd3710a2650c540090c3f2464d3a337a43c2d1f6e6a3d1360ca09adaa76cb6298f411add5fba998f3c3a323ed9
 WHIRLPOOL 
01c5d190691839e1123bc48da6c9add76bab0b6fdb87e840555b92833a9d8605c895fe9f0e6595c7d289d02955ae05b3933fa92a50b73d5b755f304321c4ec8a

diff --git a/sys-process/criu/criu-2.7.ebuild b/sys-process/criu/criu-2.7.ebuild
new file mode 100644
index ..3f163d5
--- /dev/null
+++ b/sys-process/criu/criu-2.7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+   sys-libs/libcap
+   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"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+   "${FILESDIR}"/2.5/${PN}-2.5-automagic-libbsd.patch
+   "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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 \
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-09-19 Thread Yixun Lan
commit: d44c85d4453325d70e526859bb0016bbf1d53415
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Sep 20 06:34:00 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Sep 20 06:35:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44c85d4

sys-process/criu: version bump 2.6

Package-Manager: portage-2.3.0

 sys-process/criu/Manifest|  1 +
 sys-process/criu/criu-2.6.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 0037ca2..4e22fd1 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,3 +2,4 @@ DIST criu-2.2.tar.bz2 558926 SHA256 
f893938f72d2c0693a9430e7dd39dc3d32a40187de5e
 DIST criu-2.3.tar.bz2 572580 SHA256 
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512 
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
 WHIRLPOOL 
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f
 DIST criu-2.4.tar.bz2 602896 SHA256 
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
 WHIRLPOOL 
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
+DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4

diff --git a/sys-process/criu/criu-2.6.ebuild b/sys-process/criu/criu-2.6.ebuild
new file mode 100644
index ..3f163d5
--- /dev/null
+++ b/sys-process/criu/criu-2.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+   sys-libs/libcap
+   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"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+   "${FILESDIR}"/2.5/${PN}-2.5-automagic-libbsd.patch
+   "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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}

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-09-19 Thread Yixun Lan
commit: f21369e52521cdc0d7c1f7adfe70009bed0e04d0
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Sep 20 06:34:52 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Sep 20 06:35:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f21369e5

sys-process/criu: drop old

Package-Manager: portage-2.3.0

 sys-process/criu/Manifest|  2 -
 sys-process/criu/criu-2.2.ebuild | 94 ---
 sys-process/criu/criu-2.3.ebuild | 95 
 3 files changed, 191 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4e22fd1..d16c4b5 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,5 +1,3 @@
-DIST criu-2.2.tar.bz2 558926 SHA256 
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
 WHIRLPOOL 
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
-DIST criu-2.3.tar.bz2 572580 SHA256 
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512 
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
 WHIRLPOOL 
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f
 DIST criu-2.4.tar.bz2 602896 SHA256 
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
 WHIRLPOOL 
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd
 DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62
 DIST criu-2.6.tar.bz2 614488 SHA256 
b85b50296175b1751fa2b26936cbcf5041d08a9fb49c32cb0f2b590e82dea322 SHA512 
37c5a207803213e4a98c2ea1b8f781f6bee2d7fb3c004fae4db5c56c64f61ff3177ad3fb314d1225cab4723e05900f55fc4ab466c11e7c9f9a4921634bbf90c5
 WHIRLPOOL 
5443c16af70b383d935318a9c15f9359d4f69de272533c0f713a2015718dec6f64cad59173664458a0fffc224a8f47b3c846d8cb66ce813f59ba6c32177effa4

diff --git a/sys-process/criu/criu-2.2.ebuild b/sys-process/criu/criu-2.2.ebuild
deleted file mode 100644
index a2bb1740..
--- a/sys-process/criu/criu-2.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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"
-
-PATCHES=(
-   "${FILESDIR}"/${PV}/${P}-flags.patch
-   "${FILESDIR}"/${PV}/${P}-makefile.patch
-   "${FILESDIR}"/${PV}/${P}-no-git.patch
-   "${FILESDIR}"/2.0/${PN}-2.0-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_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-g

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.5/

2016-08-24 Thread Yixun Lan
commit: 47f05b40812efe00118e59167b158084b2ecd34c
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Aug 25 01:29:43 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Aug 25 05:28:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f05b40

sys-process/criu: version bump

Package-Manager: portage-2.3.0

 sys-process/criu/Manifest  |  1 +
 sys-process/criu/criu-2.5.ebuild   | 96 ++
 .../criu/files/2.5/criu-2.5-automagic-libbsd.patch | 17 
 3 files changed, 114 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 0066ee7..0037ca2 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
 DIST criu-2.2.tar.bz2 558926 SHA256 
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
 WHIRLPOOL 
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
 DIST criu-2.3.tar.bz2 572580 SHA256 
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512 
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
 WHIRLPOOL 
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f
 DIST criu-2.4.tar.bz2 602896 SHA256 
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
 WHIRLPOOL 
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd
+DIST criu-2.5.tar.bz2 605226 SHA256 
d2a9ffec0b659c3d3a71e1d473e95e36b208b2563f136ce8f471ff9600fcc51a SHA512 
ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
 WHIRLPOOL 
9896fe45d4516a73e6b7c403a044d25902ed4a9000b0a0a053ff9d52c053adfb58c8ce0225b9841bc7e2f38de6a8e4fc6d3073d878ea5b09b81cc89cba91de62

diff --git a/sys-process/criu/criu-2.5.ebuild b/sys-process/criu/criu-2.5.ebuild
new file mode 100644
index ..3f163d5
--- /dev/null
+++ b/sys-process/criu/criu-2.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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
+   sys-libs/libcap
+   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"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+   "${FILESDIR}"/2.5/${PN}-2.5-automagic-libbsd.patch
+   "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/, sys-process/criu/files/2.1/, ...

2016-07-25 Thread Yixun Lan
commit: d72db90cfb69be1008d0b810d910b1110d7e85dc
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Jul 26 06:36:06 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Jul 26 06:36:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72db90c

sys-process/criu: drop old

Package-Manager: portage-2.3.0

 sys-process/criu/Manifest  |  2 -
 sys-process/criu/criu-1.8.ebuild   | 72 -
 sys-process/criu/criu-2.1.ebuild   | 93 --
 sys-process/criu/files/2.0/criu-2.0-flags.patch| 13 ---
 sys-process/criu/files/2.1/criu-2.1-makefile.patch | 75 -
 sys-process/criu/files/criu-1.3.1-flags.patch  | 55 -
 .../criu/files/criu-1.7-automagic-libbsd.patch | 29 ---
 sys-process/criu/files/criu-1.8-makefile.patch | 25 --
 8 files changed, 364 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 23ee5a1..0066ee7 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,5 +1,3 @@
-DIST criu-1.8.tar.bz2 534200 SHA256 
d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb SHA512 
de3f63613124606be08e5323f465c63811c35c457f4b1a311434aeb02590ebf652845b727b9e10b8a9eb9402c97e772ff044135bec7797cc6e4ad972efc9172d
 WHIRLPOOL 
2f2d18f5fbd1608acfd6ce9e1283cf05a1574b2a141cd4cf29bcacc370ed0bfce488187e40250edeb396daf8fc38f2a2e960ffd8773511a82eebce3a74663e9f
-DIST criu-2.1.tar.bz2 556820 SHA256 
7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512 
19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439
 WHIRLPOOL 
4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c
 DIST criu-2.2.tar.bz2 558926 SHA256 
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
 WHIRLPOOL 
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
 DIST criu-2.3.tar.bz2 572580 SHA256 
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512 
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
 WHIRLPOOL 
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f
 DIST criu-2.4.tar.bz2 602896 SHA256 
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
 WHIRLPOOL 
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd

diff --git a/sys-process/criu/criu-1.8.ebuild b/sys-process/criu/criu-1.8.ebuild
deleted file mode 100644
index 120c6da..000
--- a/sys-process/criu/criu-1.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~arm ~arm64"
-IUSE="setproctitle"
-
-RDEPEND="dev-libs/protobuf-c
-   setproctitle? ( dev-libs/libbsd )"
-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}-1.3.1-flags.patch
-   epatch "${FILESDIR}"/${PN}-1.8-makefile.patch
-   epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch
-}
-
-criu_arch() {
-   # criu infers the arch from $(uname -m).  We never want this to happen.
-   case ${ARCH} in
-   amd64) echo "x86_64";;
-   arm64) echo "aarch64";;
-   x86)   echo "i386";;
-   *) echo "${ARCH}";;
-   esac
-}
-
-src_compile() {
-   emake \
-   CC="$(tc-getCC)" \
-   LD="$(tc-getLD)" \
-   OBJCOPY="$(tc-getOBJCOPY)" \
-   ARCH="$(criu_arch)" \
-   V=1 WERROR=0 \
-   SETPROCTITLE=$(usex setproctitle) \
-   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
-}
-
-src_install() {
-   emake \
-   AR

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.4/

2016-07-25 Thread Yixun Lan
commit: 960a994558dfd82011f8cd6db61d75b269cf4a79
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Jul 26 06:15:12 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Jul 26 06:15:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960a9945

sys-process/criu: version bump 2.4

Package-Manager: portage-2.3.0

 sys-process/criu/Manifest  |  1 +
 sys-process/criu/criu-2.4.ebuild   | 95 ++
 sys-process/criu/files/2.4/criu-2.4-makefile.patch | 78 ++
 3 files changed, 174 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index ba77989..23ee5a1 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,3 +2,4 @@ DIST criu-1.8.tar.bz2 534200 SHA256 
d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c7
 DIST criu-2.1.tar.bz2 556820 SHA256 
7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512 
19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439
 WHIRLPOOL 
4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c
 DIST criu-2.2.tar.bz2 558926 SHA256 
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
 WHIRLPOOL 
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
 DIST criu-2.3.tar.bz2 572580 SHA256 
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512 
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
 WHIRLPOOL 
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f
+DIST criu-2.4.tar.bz2 602896 SHA256 
2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 
04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72
 WHIRLPOOL 
9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd

diff --git a/sys-process/criu/criu-2.4.ebuild b/sys-process/criu/criu-2.4.ebuild
new file mode 100644
index 000..e17b58a
--- /dev/null
+++ b/sys-process/criu/criu-2.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.4/${PN}-2.4-makefile.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+   "${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
+   "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+   "${FILESDIR}"/2.3/${PN}-2.3-aarch64.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 \
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/2.3/, sys-process/criu/

2016-07-05 Thread Yixun Lan
commit: 41709353b0082a035bd5ac773cc7b30eb9d51f68
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Jul  5 09:09:01 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Jul  5 09:10:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41709353

sys-process/criu: revert to ARCH=aarch64

upstream try to parse ARCH=arm64, but internally still using ARCH=aarch64

Package-Manager: portage-2.3.0_rc1

 sys-process/criu/criu-2.3.ebuild  |  2 ++
 sys-process/criu/files/2.3/criu-2.3-aarch64.patch | 22 ++
 2 files changed, 24 insertions(+)

diff --git a/sys-process/criu/criu-2.3.ebuild b/sys-process/criu/criu-2.3.ebuild
index d67ab07..faf66ed 100644
--- a/sys-process/criu/criu-2.3.ebuild
+++ b/sys-process/criu/criu-2.3.ebuild
@@ -41,12 +41,14 @@ PATCHES=(
"${FILESDIR}"/${PV}/${P}-no-git.patch
"${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+   "${FILESDIR}"/${PV}/${P}-aarch64.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
 }

diff --git a/sys-process/criu/files/2.3/criu-2.3-aarch64.patch 
b/sys-process/criu/files/2.3/criu-2.3-aarch64.patch
new file mode 100644
index 000..e857b6a
--- /dev/null
+++ b/sys-process/criu/files/2.3/criu-2.3-aarch64.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 0e2636b..ef8f78b 100644
+--- a/Makefile
 b/Makefile
+@@ -25,7 +25,7 @@ export SRC_DIR
+ 
+ #
+ # Architecture specific options.
+-ifneq ($(filter-out x86 arm arm64 ppc64,$(ARCH)),)
++ifneq ($(filter-out x86 arm aarch64 ppc64,$(ARCH)),)
+ $(error "The architecture $(ARCH) isn't supported")
+ endif
+ 
+@@ -39,7 +39,7 @@ ifeq ($(ARCH),arm)
+ SRCARCH   := arm
+ endif
+ 
+-ifeq ($(ARCH),arm64)
++ifeq ($(ARCH),aarch64)
+ ARCH  := aarch64
+ SRCARCH   := aarch64
+ VDSO  := y



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-07-04 Thread Stephen Klimaszewski
commit: 3129d67a8391aa393e56622410f0d94d61259bde
Author: Steev Klimaszewski  gentoo  org>
AuthorDate: Mon Jul  4 19:04:49 2016 +
Commit: Stephen Klimaszewski  gentoo  org>
CommitDate: Mon Jul  4 19:04:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3129d67a

sys-process/criu: Fix passing arch to fix build on arm64

Upstream wants to do the aarch64 replacement themselves, so don't pass aarch64
in the ebuild, otherwise we end up with the following type error:

make -j8 -l10 CC=aarch64-unknown-linux-gnu-gcc LD=aarch64-unknown-linux-gnu-ld 
OBJCOPY=aarch64-unknown-linux-gnu-objcopy LIBDIR=/usr/lib64 ARCH=aarch64 V=1 
WERROR=0 DEBUG=0 SETPROCTITLE=no PYCRIU=no all docs
Makefile:29: *** "The architecture aarch64 isn't supported".  Stop.

Package-Manager: portage-2.3.0

 sys-process/criu/criu-2.3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-process/criu/criu-2.3.ebuild b/sys-process/criu/criu-2.3.ebuild
index 971a670..d67ab07 100644
--- a/sys-process/criu/criu-2.3.ebuild
+++ b/sys-process/criu/criu-2.3.ebuild
@@ -47,7 +47,6 @@ 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
 }



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.3/

2016-06-24 Thread Yixun Lan
commit: 7e8fcadffb8f78e9a2c4f32543373e096990850a
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Jun 24 10:06:38 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Jun 24 10:07:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8fcadf

sys-process/criu: version bump 2.3

Package-Manager: portage-2.3.0_rc1

 sys-process/criu/Manifest|  1 +
 sys-process/criu/criu-2.3.ebuild | 94 
 sys-process/criu/files/2.3/criu-2.3-no-git.patch | 16 
 3 files changed, 111 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 5e82180..ba77989 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1,4 @@
 DIST criu-1.8.tar.bz2 534200 SHA256 
d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb SHA512 
de3f63613124606be08e5323f465c63811c35c457f4b1a311434aeb02590ebf652845b727b9e10b8a9eb9402c97e772ff044135bec7797cc6e4ad972efc9172d
 WHIRLPOOL 
2f2d18f5fbd1608acfd6ce9e1283cf05a1574b2a141cd4cf29bcacc370ed0bfce488187e40250edeb396daf8fc38f2a2e960ffd8773511a82eebce3a74663e9f
 DIST criu-2.1.tar.bz2 556820 SHA256 
7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512 
19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439
 WHIRLPOOL 
4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c
 DIST criu-2.2.tar.bz2 558926 SHA256 
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
 WHIRLPOOL 
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7
+DIST criu-2.3.tar.bz2 572580 SHA256 
acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512 
b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a
 WHIRLPOOL 
a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f

diff --git a/sys-process/criu/criu-2.3.ebuild b/sys-process/criu/criu-2.3.ebuild
new file mode 100644
index 000..971a670
--- /dev/null
+++ b/sys-process/criu/criu-2.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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"
+
+PATCHES=(
+   "${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+   "${FILESDIR}"/2.2/${PN}-2.2-makefile.patch
+   "${FILESDIR}"/${PV}/${P}-no-git.patch
+   "${FILESDIR}"/2.0/${PN}-2.0-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_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 \
+  

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/2.2/, sys-process/criu/

2016-06-14 Thread Yixun Lan
commit: af6724544b88a1dfbad3dcc14ca932516e299b2d
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Jun 14 14:20:25 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Jun 14 14:21:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af672454

sys-process/criu: fixed to not use git cmd

Gentoo-Bug: 580420

Package-Manager: portage-2.3.0_rc1

 sys-process/criu/criu-2.2.ebuild |  1 +
 sys-process/criu/files/2.2/criu-2.2-no-git.patch | 16 
 2 files changed, 17 insertions(+)

diff --git a/sys-process/criu/criu-2.2.ebuild b/sys-process/criu/criu-2.2.ebuild
index c18ed46..a2bb1740 100644
--- a/sys-process/criu/criu-2.2.ebuild
+++ b/sys-process/criu/criu-2.2.ebuild
@@ -38,6 +38,7 @@ RESTRICT="test"
 PATCHES=(
"${FILESDIR}"/${PV}/${P}-flags.patch
"${FILESDIR}"/${PV}/${P}-makefile.patch
+   "${FILESDIR}"/${PV}/${P}-no-git.patch
"${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch
"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
 )

diff --git a/sys-process/criu/files/2.2/criu-2.2-no-git.patch 
b/sys-process/criu/files/2.2/criu-2.2-no-git.patch
new file mode 100644
index 000..065
--- /dev/null
+++ b/sys-process/criu/files/2.2/criu-2.2-no-git.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index 7c85403..20992ed 100644
+--- a/Makefile
 b/Makefile
+@@ -179,9 +179,9 @@ test: zdtm
+ # Generating tar requires tag matched CRIU_VERSION.
+ # If not found then simply use GIT's describe with
+ # "v" prefix stripped.
+-head-name := $(shell git tag -l v$(CRIU_VERSION))
++head-name := $(shell if [ -d ".git" ]; then git tag -l v$(CRIU_VERSION); fi)
+ ifeq ($(head-name),)
+-head-name := $(shell git describe)
++head-name := $(shell if [ -d ".git" ]; then git describe; fi)
+ endif
+ tar-name := $(shell echo $(head-name) | sed -e 's/^v//g')
+ criu-$(tar-name).tar.bz2:



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-05-27 Thread Lars Wendler
commit: ffa963dff3badce964a6dc0a19d11a5216c5958b
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 27 09:33:35 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 27 09:33:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa963df

sys-process/criu: Fixed incomplete EAPI-6 conversion (bug #584308).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 sys-process/criu/criu-2.2.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-process/criu/criu-2.2.ebuild b/sys-process/criu/criu-2.2.ebuild
index f971fd4..c18ed46 100644
--- a/sys-process/criu/criu-2.2.ebuild
+++ b/sys-process/criu/criu-2.2.ebuild
@@ -35,12 +35,12 @@ CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS 
~FHANDLE ~EVENTFD ~EPOLL ~
 
 RESTRICT="test"
 
-src_prepare() {
-   epatch "${FILESDIR}"/${PV}/${P}-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
-}
+PATCHES=(
+   "${FILESDIR}"/${PV}/${P}-flags.patch
+   "${FILESDIR}"/${PV}/${P}-makefile.patch
+   "${FILESDIR}"/2.0/${PN}-2.0-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.



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/files/2.0/, sys-process/criu/

2016-05-27 Thread Yixun Lan
commit: c25c0b89e18f461c49ac6af2d8a009ff5524e486
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri May 27 06:46:59 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri May 27 07:16:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25c0b89

sys-process/criu: drop old versions

Package-Manager: portage-2.2.28

 sys-process/criu/Manifest  |  3 -
 sys-process/criu/criu-1.6.1.ebuild | 72 -
 sys-process/criu/criu-1.7.2.ebuild | 72 -
 sys-process/criu/criu-2.0-r1.ebuild| 93 --
 sys-process/criu/files/2.0/criu-2.0-makefile.patch | 77 --
 sys-process/criu/files/criu-1.3.1-makefile.patch   | 20 -
 .../criu/files/criu-1.5-automagic-libbsd.patch | 29 ---
 7 files changed, 366 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index a0138aa..5e82180 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,6 +1,3 @@
-DIST criu-1.6.1.tar.bz2 484598 SHA256 
c74810383b7e524be0d909b9a6c1805e0887ac93cf1bfa28f00a87f395879e18 SHA512 
59de498035970decc5181c3e464ccf686fce34e9fa5285d0c6777849013b8441a4338ef7f89339953ff83dcaf1b7e95dbbd54432f61a28665fbde979df5e31e8
 WHIRLPOOL 
07fa8490bca046a17476b59e375a287dacbb13c1a99ac0a05166c5925d997748ca506c1cf3bab2bdae832010f6d87e7aa6f4b4371ce7c7d630120a0f47f1ae23
-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
 DIST criu-2.2.tar.bz2 558926 SHA256 
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
 WHIRLPOOL 
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7

diff --git a/sys-process/criu/criu-1.6.1.ebuild 
b/sys-process/criu/criu-1.6.1.ebuild
deleted file mode 100644
index 3806853..000
--- a/sys-process/criu/criu-1.6.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~arm ~arm64"
-IUSE="setproctitle"
-
-RDEPEND="dev-libs/protobuf-c
-   setproctitle? ( dev-libs/libbsd )"
-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}-1.3.1-flags.patch
-   epatch "${FILESDIR}"/${PN}-1.3.1-makefile.patch
-   epatch "${FILESDIR}"/${PN}-1.5-automagic-libbsd.patch
-}
-
-criu_arch() {
-   # criu infers the arch from $(uname -m).  We never want this to happen.
-   case ${ARCH} in
-   amd64) echo "x86_64";;
-   arm64) echo "aarch64";;
-   x86)   echo "i386";;
-   *) echo "${ARCH}";;
-   esac
-}
-
-src_compile() {
-   emake \
-   CC="$(tc-getCC)" \
-   LD="$(tc-getLD)" \
-   OBJCOPY="$(tc-getOBJCOPY)" \
-   ARCH="$(criu_arch)" \
-   V=1 WERROR=0 \
-

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/2.2/, sys-process/criu/

2016-05-27 Thread Yixun Lan
commit: 81c43e8ea9a5561629e34e1030ea835a655eb62b
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri May 27 06:43:57 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri May 27 07:16:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c43e8e

sys-process/criu: version bump 2.2

Package-Manager: portage-2.2.28

 sys-process/criu/Manifest  |  1 +
 sys-process/criu/criu-2.2.ebuild   | 93 ++
 sys-process/criu/files/2.2/criu-2.2-flags.patch| 13 +++
 sys-process/criu/files/2.2/criu-2.2-makefile.patch | 77 ++
 4 files changed, 184 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 8eb6929..a0138aa 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -3,3 +3,4 @@ DIST criu-1.7.2.tar.bz2 508012 SHA256 
f5d377fd2a3c8824c592f6c27147cb4d37333ca0ce
 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
+DIST criu-2.2.tar.bz2 558926 SHA256 
f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 
3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd
 WHIRLPOOL 
62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7

diff --git a/sys-process/criu/criu-2.2.ebuild b/sys-process/criu/criu-2.2.ebuild
new file mode 100644
index 000..f971fd4
--- /dev/null
+++ b/sys-process/criu/criu-2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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}"/${PV}/${P}-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 \
+  

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.1/

2016-04-25 Thread Yixun Lan
commit: 2ade38cda74f8939e478589883047e0c2af92e8e
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Apr 25 07:05:21 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Apr 25 07:37:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ade38cd

sys-process/criu: version bump 2.1

Package-Manager: portage-2.2.28

 sys-process/criu/Manifest  |  1 +
 sys-process/criu/criu-2.1.ebuild   | 93 ++
 sys-process/criu/files/2.1/criu-2.1-makefile.patch | 75 +
 3 files changed, 169 insertions(+)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 77aa45f..8eb6929 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 000..40e9317
--- /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="${EPRE

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-03-20 Thread Yixun Lan
commit: 7598248bcc81e500a1266b6990ad19d932d7c08f
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Mar 21 06:14:36 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Mar 21 06:14:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7598248b

sys-process/criu: revision bump since libdir path changed

Package-Manager: portage-2.2.27

 sys-process/criu/{criu-2.0.ebuild => criu-2.0-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sys-process/criu/criu-2.0.ebuild 
b/sys-process/criu/criu-2.0-r1.ebuild
similarity index 100%
rename from sys-process/criu/criu-2.0.ebuild
rename to sys-process/criu/criu-2.0-r1.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/, sys-process/criu/files/2.0/

2016-03-20 Thread Yixun Lan
commit: 9d0fde94a897009dcd5c6a04ad599fa66d68cdec
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Mar 21 06:06:37 2016 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Mar 21 06:06:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0fde94

sys-process/criu: fix LIBDIR path, using $(get_libdir)

Package-Manager: portage-2.2.27

 sys-process/criu/criu-2.0.ebuild   |  2 +
 sys-process/criu/files/2.0/criu-2.0-makefile.patch | 67 --
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/sys-process/criu/criu-2.0.ebuild b/sys-process/criu/criu-2.0.ebuild
index b8c2198..51da20c 100644
--- a/sys-process/criu/criu-2.0.ebuild
+++ b/sys-process/criu/criu-2.0.ebuild
@@ -56,6 +56,7 @@ src_compile() {
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) \
@@ -80,6 +81,7 @@ src_install() {
PREFIX="${EPREFIX}"/usr \
LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
DESTDIR="${D}" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
install
 
dodoc CREDITS README.md

diff --git a/sys-process/criu/files/2.0/criu-2.0-makefile.patch 
b/sys-process/criu/files/2.0/criu-2.0-makefile.patch
index b9c9cb4..a2783c7 100644
--- a/sys-process/criu/files/2.0/criu-2.0-makefile.patch
+++ b/sys-process/criu/files/2.0/criu-2.0-makefile.patch
@@ -1,40 +1,36 @@
-Index: criu-2.0/Makefile.install
-===
 criu-2.0.orig/Makefile.install
-+++ criu-2.0/Makefile.install
-@@ -5,13 +5,12 @@ PREFIX   ?= /usr/local
+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/
--LIBDIR?= $(PREFIX)/lib
 +LOGROTATEDIR  ?= $(SYSCONFDIR)/etc/logrotate.d/
+ LIBDIR?= $(PREFIX)/lib
  INCLUDEDIR?= $(PREFIX)/include/criu
  
- #
- # For recent Debian/Ubuntu with multiarch support.
+-#
+-# For recent Debian/Ubuntu with multiarch support.
 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 
2>/dev/null)
-+DEB_HOST_MULTIARCH ?=
- ifneq "$(DEB_HOST_MULTIARCH)" ""
- LIBDIR?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
- else
-Index: criu-2.0/scripts/nmk/scripts/build.mk
-===
 criu-2.0.orig/scripts/nmk/scripts/build.mk
-+++ criu-2.0/scripts/nmk/scripts/build.mk
-@@ -43,7 +43,7 @@ builtin-name := $(strip $(builtin-name))
+-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
  
- #
- # Link flags.
--ld_flags  := $(strip $(LDFLAGS) $(ldflags-y))
-+ld_flags  := $(strip $(RAW_LDFLAGS) $(ldflags-y))
- 
- #
- # Prepare targets.
-Index: criu-2.0/lib/Makefile
-===
 criu-2.0.orig/lib/Makefile
-+++ criu-2.0/lib/Makefile
+diff --git a/lib/Makefile b/lib/Makefile
+index 0cd59a1..63bdaba 100644
+--- a/lib/Makefile
 b/lib/Makefile
 @@ -20,10 +20,12 @@ PHONY += lib-c
  
  #
@@ -57,7 +53,7 @@ Index: criu-2.0/lib/Makefile
$(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)
-@@ -49,8 +51,6 @@ install: lib-c lib-py ../crit/crit c/cri
+@@ -49,8 +51,6 @@ 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
@@ -66,3 +62,16 @@ Index: criu-2.0/lib/Makefile
  .PHONY: install
  
  .PHONY: $(PHONY) clean
+diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
+index 10a5d44..ffe2a3c 100644
+--- a/scripts/nmk/scripts/build.mk
 b/scripts/nmk/scripts/build.mk
+@@ -43,7 +43,7 @@ builtin-name := $(strip $(builtin-name))
+ 
+ #
+ # Link flags.
+-ld_flags  := $(strip $(LDFLAGS) $(ldflags-y))
++ld_flags  := $(strip $(RAW_LDFLAGS) $(ld

[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-03-15 Thread Alexis Ballier
commit: 162f0cf647a137797363d5d42515c6d617532f15
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Mar 15 15:09:33 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Mar 15 15:12:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162f0cf6

sys-process/criu: add missing dep on libnl:3

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 sys-process/criu/criu-2.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-process/criu/criu-2.0.ebuild b/sys-process/criu/criu-2.0.ebuild
index 06d9277..c1c17f8 100644
--- a/sys-process/criu/criu-2.0.ebuild
+++ b/sys-process/criu/criu-2.0.ebuild
@@ -18,6 +18,7 @@ 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}



[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

2016-03-15 Thread Alexis Ballier
commit: 8e3fc8440cf9d61abdddc42eb5b0ebbf55b28c8c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Mar 15 15:02:53 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Mar 15 15:12:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3fc844

sys-process/criu: add missing quotes aroud D

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 sys-process/criu/criu-2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-2.0.ebuild b/sys-process/criu/criu-2.0.ebuild
index 2d4b80a..06d9277 100644
--- a/sys-process/criu/criu-2.0.ebuild
+++ b/sys-process/criu/criu-2.0.ebuild
@@ -69,7 +69,7 @@ src_test() {
 }
 
 install_crit() {
-   "${PYTHON:-python}" ../scripts/crit-setup.py install --root=${D} 
--prefix="${EPREFIX}/usr/"
+   "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" 
--prefix="${EPREFIX}/usr/"
 }
 
 src_install() {



  1   2   >