arm64 support added & drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

5 files changed, 37 insertions, 71 deletions

diff --git a/sys-process/criu/ChangeLog b/sys-process/criu/ChangeLog
index d5a17bfdca83..3d9897b672ea 100644
--- a/sys-process/criu/ChangeLog
+++ b/sys-process/criu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/criu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.21 2015/04/13 02:21:24 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.22 2015/04/14 10:06:22 dlan Exp $
+
+  14 Apr 2015; Yixun Lan <dlan@gentoo.org> -criu-1.5-r2.ebuild,
+  criu-1.5.1.ebuild, +files/criu-1.5.1-arm64-ptrace.patch:
+  arm64 support added & drop old
 
 *criu-1.5.1 (13 Apr 2015)
 
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 090b277738c3..f6b48f6d0d87 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -4,30 +4,29 @@ Hash: SHA256
 AUX criu-1.3.1-flags.patch 1447 SHA256 ff15fd9c824e6fb24fd21ac6e3caf4cebd05f16ca376da852b3e82a69c107fce SHA512 be37bab3f015d4e92d3f2bdb26b4c1fd5f1cbadc9db8a90813545efcf5fe2268274a88781af5d4a72a94c9971de97483098f5731da308a21721245a5e4d42ef1 WHIRLPOOL e3980c613eff670f1b0fc373c9872b20d7052757f7cfede05ea16d43416f53bc0ca86312380c4a7957644415e414535129ca6523a6118f0774fff78c51ab303e
 AUX criu-1.3.1-makefile.patch 662 SHA256 49b0a1c52acbb2c29f2e0f82306a19eb5c8d6fab917b259364dec83d743722f6 SHA512 79ade9b4ed7107ce2994dd5eddc64c2c03278d7dae3c21b3cb1cb6732bc70ad6f8534794f68bac13a1d6cee9c6baff1d9dda9c8517187c665fb46dc6e270fb9c WHIRLPOOL 197a90bfb90054f5fc8c8d0b89dbd854e59b7b15af4ad8238643856ba23d9f54b02c4a30e7379962a5558ea25b18ca4bae1d702a94906df6a7ea643ce3c00613
 AUX criu-1.5-automagic-libbsd.patch 726 SHA256 dcc5165963fa6962fc3fd0a9ec2b7590c24cae493310129b565534c2dbf2db3a SHA512 5c9d5a401a821d9f3b1569072fd117a449a5d174983b748f45825b9bee7c9a0a3a62241c4623c8da8855a93dc0126dc74877a3226ce47b0bbea0b2bbc8eac3a8 WHIRLPOOL 1b052c2e7ec0325e757d771a78de23a9359e9e7e30c1947a45ce5c7da3f394998a308c6c59f19a57d7dca2342c7b801c9d28d4e8c78fa803bfd642122a600192
+AUX criu-1.5.1-arm64-ptrace.patch 341 SHA256 777bae08b06dae307b45f6027385085dcb317454b5aa157edcc972c59173b4d6 SHA512 5251d0382fa526319b2b4d9475c96d753e43e5328a6418a0b0f88fd214288936425cfe67c624e45c1c28c0ee1ed2dd47370db47f91f277aa2b52c590e983f16d WHIRLPOOL e6e96a08406413b9b8c465d7e018d66b7ad1b967285411b9e1714670095f8f285a07a1d512cbf7e0b025dd7e7917c8861fa6994adb5049550b60ac51f3203891
 DIST criu-1.4.tar.bz2 432735 SHA256 757347b3bfe824f93b9a5c98e60dfac5a73da978eb7ebd29d721dea496eaf789 SHA512 af7aae488bff97d6079cab9d01a64df7adc21c146e56a7c2429d7654aa86a0a1d306bbb828210c0d6badf82177b3eb37541472e59ce2b40783dde9a11df76403 WHIRLPOOL 02c5fa23ca250d3a9d15d3c16a54c0f2c082d5103934c3eb03d61988013bbf4f6b8fe69524b07438e4761b4c829d6f9666c09bd367b3569014e1f0c7e6875a5a
 DIST criu-1.5.1.tar.bz2 457316 SHA256 0bf47f02e32ac7d81bb953ba6ecd0b8dd748728042afed36f31852a59042a8d2 SHA512 a91323d062725286870bb22dcdbcc0ec3c132a12ec029dcc17bcb03e87b17c5011af7705fd315f2aff5904b96403ad8375a5dd6fc271d2b86a97f213d8659bdd WHIRLPOOL 1ea22cc018964d902e13d85ac4de287c426c58e57add6d605c298fad6657db8f8bd95d9da4505b2ec0f415aa1b1bc9839d4173f9b1d4a13ee72619b1ce749eaa
-DIST criu-1.5.tar.bz2 457323 SHA256 c848918d5b67f68efd25224bc4a7ffe9252d039fc6f3cc77c6309f6427448cdf SHA512 aef29e29aad679ccbf453ca5505cdd06cd7c01ac502fb47c09b576adfa352d5d07f26096361bb8e13ad732de412e68c04fcec0fab60c3ca1b23b5adc80fb1a4e WHIRLPOOL bae8ef0da98f57f2236c12bbd30a0060b260347d68fa37a804a46d9d44c3a56d55aa8ac5b54cdea3f47a316d353488ae36aef68d31b1fa51526d22965f77d547
 EBUILD criu-1.4.ebuild 1238 SHA256 4e6ced8e72d3c7b94cb5190abc90b093015cb54c04b659f92f23a0973c2e21e0 SHA512 977ca256b8bc669e97b21362b674c0ac9f117ed60b8194c2e724d70c902b145c29f40284b565ac3d57fcc54a4c55958b74a515222b799d2d78ff6bc9ac7eee19 WHIRLPOOL b92675eb89900725b1b999ed213b7b39cd1df7fe3f113f3109583ddcc7f8da7df83e09f28c4d1643e6a9b84652d545155f3c30a3576ecb5a581ddee769068db8
-EBUILD criu-1.5-r2.ebuild 1382 SHA256 389b1ca66ab020b8abd41b6fddf1545661c244061fa023f86a3668288a8b509e SHA512 ef7d53b38df82480940df39ed912d2f778f386ca8886fe3336129ded0b1db19ba7943f324ed5537bf6116f46454e932737a4784e32235ef4dd2f208d52654c00 WHIRLPOOL 26aaa952dbc155985f16ec891b41335c7ef332d54d63a9a440df84b6adcaf7fe73266523fdb4be4572dcd936cbbf5915a63b208acb6982b1fa66dccc62a789c3
-EBUILD criu-1.5.1.ebuild 1381 SHA256 a66e7bb556c70ce43fed2ecc61c0b38a23a4ee6a8aaf68d3585895fe50bd51df SHA512 9d8c4d884a82d15410d296ff33921c73646ceca4ecfaccc70aa777c23173a1c49122e77dcaad5b8061fc6b46be4a2d3d5963fb83c6688da846885a96558adb0d WHIRLPOOL caa16371509852266cbad6701cfa74f4edf42db050186bf437e6ffcaf931521e9ae3d9a2e612e8f8e7e025f8081bba9d8307b73ec9010e459beb5ad985897660
-MISC ChangeLog 3162 SHA256 75687f57d464a722e62617cfbaa4868c03e376353690571368785fe2679ec588 SHA512 ffdda1965c21981983620719b37abc87a8ba2321fc3d7e6f31b9b4eccfec01c2f6ec80b124a1597840ec1a42b3c68023835ce0053c0a1298199cc0862e734f91 WHIRLPOOL 20db9930476cfa52351c8bc9c769b3b2abd532bac2f1180edb57334fb4257047f5009e2c7da8f184e026c6ca62622d2300efe8a961ba6b74cc679771f32dbea2
+EBUILD criu-1.5.1.ebuild 1434 SHA256 aa5cd842d6c2bd9daeb1f9fd4f163277354e013a5bffbb0bced09090b4e927a8 SHA512 d232b0699727b4ca947165fa6c565205c013211262cf1cd22e4867af049f6adaeb097bf33153bbbf52420efbfa81c947fb3819989d58e6e3dfaf24f98b734aa6 WHIRLPOOL 8d43da851b41e96a0bb95b92bc2a9adbddc371679d39501677e547f65502ad98b94dd820b7fdfad0d9932de23eebf6a27ceaec303c107deaa52a5b9f891501ae
+MISC ChangeLog 3319 SHA256 6d32209d5b689c1c650e9123199c812b442c7183835ef1fbf4a69327864e83e1 SHA512 a200fa6a817116dd32d5284e9c0d3c67f37eb1f629dcedf294b74b64a0900f70d0c17c381ca8eae65f7ca79fb868d84f24a1742dc62a3dd9c03d2f3f076ad3d7 WHIRLPOOL 77d0fd3634763682dfb3fed16f375ba6746a08ad6247e64b9ee0d5aff984f78396991e7d897cc2efb02fc5667d1871b61022e70cf5f147cde4576819416cc2aa
 MISC metadata.xml 367 SHA256 d9d70f8ffaabb1d3c702b245cd28bc33bc312244bb3dd465c8d56c11db44f739 SHA512 a31e9e6c490917e5e0a9d038cfadcaf57118e12bba936e2ce522b06432ff4e891e0aca8f048c772c882034b87173176539ae502ad043f10e9b0eb2f00667181b WHIRLPOOL cfd118b2e4c7fd7fdcbfb82a934ba6572a8b09927f483b9b2cfa8f46fe637ba05a1934e7f82c5ebf64588c0a65a611eeda58f3ef082d54e77be4ee0599ec9fd2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVK5cPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVLVVOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
-MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtcooQAIEjBbc5M9BFRLq+n75Vozsd
-eANBo0E5IFh65YA6h4F82dFTwSLZNtk0CYAztmmaMHJZ75wGuU9YVMy0uWElzf4s
-6wHzEoiGwl0JLcUxOw6s9av3xgsL4cHTgR+da+VUlpZ5XYTGVkjthFhpSM4TAEPb
-er494NjShaZWPTfVL4/2/IC6aC3ViYxQk8efw6eyvTLreilSIVdT/WXeYmrTHKbj
-/xZgShvro9lBsZW5LoqNe1YFij7gktQFY5u9H5A143oKxpL7MR0VDXTAmGXNJarJ
-xBSo7o3PBXWe0je6X6JFOTBY2SPopDqEo17HJneOnRmf5/9W6G+qBrWHjGnsU9AG
-4gpODwnKnIQNmfDTypN8EYZfAI0r+8frbtQIFPRNOTGfQyoEob8zM8EOXx1eaTT3
-0h5WSCW2J90VCtWOJv+2zE76/FNqGLGEFy+nXsiZVQKk0RBwHbdecct8bE9Ns9mT
-P6SYChV1L8YbAoNVSMGzCI1Sp9dst/8bGpbFJGnirVMBOzQsBKfdiw4T4S7AFT6O
-M8C2bZjINTrIKD216hrX4BvxuLYpMkWOO7NX5baPfiK4qRTbLW9V+tOzb3hG9mWc
-GGVCCLWlyI9WFz7z2UaMgnPS5FI1NVLGGkcWEY6oZbW1j6Au/BOvxVyaNOBTcypu
-W96pKRtywf/yqR0gU6cH
-=+jFC
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvthQsP/RdRNHd/8o0A2u9ciT5dkL5p
+a7PvOYxM4E2PHPrNKRkbvk4EemAK3RNHc1DHKmytTRV1W+1y7SY1m+q2O3khuwuT
+f1T13+h7jnIBrw/XEPTP58WMZ9vHNse0BFVwMdaMQP5M8z+s30QNE/d4TxafUdRG
+m6qJm1dj++2NKSPMU0t8oHMRK0oVNPP6hBvaIjTP0yKLIYU7RHharQNUQIrT7Fqa
+tRS1USRZWm2OW1edRUi37h/TWLRjob00y4SygmSj/nlUxHdTGsMMCI9s/a9wIfm+
+2SfAeEJc7E5mdZ+xPG+DwzuFVu27+kqtuaDPLLiqBk9sCMRcCmYQtDgl4K/GYNMS
+CGx+wXBB9WEU9e0+XbfRZy/ulMjQeDslVAcg3DnuFP7XqZs7z4OlJ/jgioV9Gm+N
+M3EphJzh0eI4lkiOHu1ptQE5OTXy0F4mRVZRftpp+urXQ6jeb9hPj8WEHpx0wzCp
+IvZGEf44zQvyN44IDSghdLLntQv+PmWPBGXEkPHzqTU/NGFrS/xksaO02hQ+t7kh
+iX8hTKOZPnjdX7rFS6ljltfG3bnelJ6QMVLdY7SDq2232tNYew+Z1FnrJlfmSXCW
+FbEYKg+2fio2kuyQn5VbyJxGKIApDW7jHV0hYU/XHK3z7Iuu2JHP8GodyFKKR77q
+et7VhF7tA2JLijq+r9sM
+=j3iT
 -----END PGP SIGNATURE-----
diff --git a/sys-process/criu/criu-1.5-r2.ebuild b/sys-process/criu/criu-1.5-r2.ebuild
deleted file mode 100644
index 21b4fbe76713..000000000000
--- a/sys-process/criu/criu-1.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.5-r2.ebuild,v 1.1 2015/03/16 02:51:21 radhermit Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs linux-info flag-o-matic
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-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}"/${P}-automagic-libbsd.patch
-}
-
-src_compile() {
-	unset ARCH
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" V=1 SETPROCTITLE=$(usex setproctitle) WERROR=0 all docs
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test
-	fi
-}
-
-src_install() {
-	emake SYSCONFDIR="${EPREFIX}"/etc PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
-	dodoc CREDITS README
-}
diff --git a/sys-process/criu/criu-1.5.1.ebuild b/sys-process/criu/criu-1.5.1.ebuild
index 83f3c6abde7a..5fa5e6c44461 100644
--- a/sys-process/criu/criu-1.5.1.ebuild
+++ b/sys-process/criu/criu-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.5.1.ebuild,v 1.1 2015/04/13 02:21:24 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.5.1.ebuild,v 1.2 2015/04/14 10:06:22 dlan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="setproctitle"
 
 RDEPEND="dev-libs/protobuf-c
@@ -30,6 +30,7 @@ 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
+	epatch "${FILESDIR}"/${P}-arm64-ptrace.patch
 }
 
 src_compile() {
diff --git a/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch b/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch
new file mode 100644
index 000000000000..497838132a24
--- /dev/null
+++ b/sys-process/criu/files/criu-1.5.1-arm64-ptrace.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/aarch64/include/asm/types.h b/arch/aarch64/include/asm/types.h
+index 8dd336e..6657279 100644
+--- a/arch/aarch64/include/asm/types.h
++++ b/arch/aarch64/include/asm/types.h
+@@ -3,6 +3,7 @@
+ 
+ #include <stdbool.h>
+ #include <signal.h>
++#include <asm/ptrace.h>
+ #include "protobuf/core.pb-c.h"
+ 
+ #include "asm-generic/page.h"