Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 98 insertions, 9 deletions

diff --git a/sys-process/criu/ChangeLog b/sys-process/criu/ChangeLog
index e8ce6c14f914..a0f0808a9d29 100644
--- a/sys-process/criu/ChangeLog
+++ b/sys-process/criu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/criu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.7 2014/02/19 12:07:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.8 2014/03/01 05:40:30 radhermit Exp $
+
+*criu-1.2 (01 Mar 2014)
+
+  01 Mar 2014; Tim Harder <radhermit@gentoo.org> +criu-1.2.ebuild,
+  +files/criu-1.2-makefile.patch:
+  Version bump.
 
 *criu-1.1 (19 Feb 2014)
 
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index f6c32d0bd2b7..263e315b4f5b 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX criu-0.6-flags.patch 1408 SHA256 e0b6518b5db4221ccd2ed774cefb6169afb30e4826e3d679ab10f3ccf456b56f SHA512 92d0c42552f7eafc4fa0d8033dc6acf2a5d23b4c050685a00d4e1007fe12362a61bf049288a6906ebc2d2a2ee9bcb908e8583e53f8f7c71f7f866adbecb8f8a9 WHIRLPOOL 7cc19549e0916cb056f2807c1f984dffc55101bd78239e887345cf23406fd60200b768cdcf6d1f38fcf279caad8688df42108a3818af36ff63b10cdb8490c900
+AUX criu-1.2-makefile.patch 1048 SHA256 ed6e886715635fc919df1e7cec398f22fcc8a630219d6747ef2f071d4c7a73c0 SHA512 9547881e921c71c8498e733766e7e42bb392a2bb86a83caa469db6c8d5db3c6badef310903b2dfd3d66ff9613c4623d0f2afc20c6cb96c734e3572a63f658912 WHIRLPOOL ce145ebcfd507c8af65ac6252d2838c4891d5a56fc66de7c1640965ea251e07b1904035311d4384a95799b75347c0aa8e8313d96f01744dd4c608a7ad02403cc
 AUX crtools-0.4-flags.patch 1824 SHA256 02812881204783dd50654f60d76c91c6e2e70686c9fabb2ddf6069acbe01c6a9 SHA512 6db4c556b0c72a5d8563986260c60feab617fdbffe113bb5e4698968aae47c10c44a8cd9bb1d1385c22d7c2c569859004d6ac8c98b7f54b7c34fb9605772361c WHIRLPOOL b94e23cc7ae23ffc5ccaf487ec6be70a6a8e228b92f5f23fead4160061aad40074a8bc924388ce153bffb8a916762b6fe5e488d2c5d7d7db5cfe0142e0a727fb
 DIST criu-0.5.tar.bz2 262342 SHA256 23d4717a151be0233fdf7e66ad5bf4f4f01f48abec93c5f3189b984b8a3377a5 SHA512 1d3d3ea0116153511a6c0c0198dc7994beb4ae6af5d2bca4ccf05532b1426bff7e96c75ca773e66a63f987de73357bc5cfe8bd645dd0acbf134f2bd66d0abe68 WHIRLPOOL eb91aa4ad24bfbc9603f9b9078f2b9a82ef228d5a6d66d558ebf9adae245f10b93071eb7ad9e4f39beaefccfc6f5cc3d8a765e8e69ee21821a62148ffa03e7a7
 DIST criu-0.6.tar.bz2 277717 SHA256 95354cf2140ac82c0b6b7b0efc0825ec84dab7dbb03c171d0a109229d0dbf730 SHA512 74710cf0472213db2a7300c4d69e2befb6bbe1d4d1e60dc53ad25bcfd3580b6cbe651e9372693649e13a4246227b593197f22696c044aaa1655e946253321443 WHIRLPOOL 736f177f88dda513bac9f328fff52689302e791317223b00b718baae7a558b161a61b746e7e7035bfeb6dcf5a3cd2053b97374a48d0e89683d07c2c2b3422c31
@@ -9,22 +10,24 @@ DIST criu-0.7.tar.bz2 291165 SHA256 5751448820e827e9911c52776b559470087e533ffa66
 DIST criu-0.8.tar.bz2 303174 SHA256 41630a0ea3650caf9cb7acec550c986f063da139a7a36d9945045779d5f8b29a SHA512 630d703d1a9b42b7940781b483aede58a2976ac4b9f48c9e518a937a90874b4614befa64097daf53aa39c77fc1ad9e9cda52b5f7f29790657b0e637eb90f91b7 WHIRLPOOL d6c13960c7af2dff92fc1286a00745e3e50156ed0cf58b1215aed7c6321a3677f0857885d07e6dffa97e6945846fe438bbfc5aafef1750b951ad2cbadb1d59d6
 DIST criu-1.0.tar.bz2 307122 SHA256 4243202d05d9900fca6249e62814d2b4e2b775c49631bc84654c5dc09f730f1f SHA512 79fde956804d42d12313d9e2b56cc6d86bdce53a0ee318be824cee2c8d1b0d25ed91955f10e5ba2da03091b26fdbc3afbf74ac7ae458f9df28f10d1f80c1f15b WHIRLPOOL 6de361ac0c1ffaeadbaead640bd0e6f379b7d9de728ab97ffb2eedfa864249d1c8cc437ee58f93763ecd38037d60334e9c81bde00d57abf52780fc25b919e75f
 DIST criu-1.1.tar.bz2 323535 SHA256 ff7700e3e55f1fca5ec559b4adee57f64f647a9920a1bd11c510cc67ed137f7d SHA512 da6930da0617d770f28675d3e8e2c1575d28bffb6abe44180ec62f10999685ef6d2dcd7d1d4714aaaba6b570b3bc0fc26a6dabb229d90756c8a71ec195aa7a65 WHIRLPOOL c9faa60d6c4acea6433ed33d8e419fbbd4bb532eb1d926389dbf7856e527b418d97f16a3255706c5db92a320deabf7f0578502ad9b16754f533ff4af736cfabf
+DIST criu-1.2.tar.bz2 335531 SHA256 3ebdb544690f75c3e0f70d9af4d09f4f0d654ecea59e14abe3a5c9f536b6b413 SHA512 c7b9bcae46a262ae566108aea3a2b25560fbcd3c54803a37d4392ff0b5b993f273a4c2fe197b9f03f4f370a8cceaa9481bd73d5cc89833346e1b5b5ef8429dec WHIRLPOOL 9a8c2ffaf62923d4c1d230170aeb3dac4d3cd3adb47fee4b0591b5bd3135d7b993cdc726f33d193838d33ff61ac50bbd0185a913bb64dc712e53f90fff6475d6
 EBUILD criu-0.5.ebuild 1062 SHA256 885f8ce0fef8cde28847b5298a504516c8524383122692f3ed20bc57122f4922 SHA512 a88e7cf07e948149e839ea2afd5bec1580d0beca0c12d1470723f79c7e98f714035e5e5440de8d4a191d06696fd1137bcbe59539dfe1bc893395e34ee10b5b83 WHIRLPOOL ce5ea287de093c4407fd241a57c092c19a01e1075cb6db13f88731cecacf3c382afa15aed25d1072bb2f08e68f89abbc9d0c47e7104675215f591ab72c228a32
 EBUILD criu-0.6.ebuild 1085 SHA256 7311b600c5fe44c47421fdce14f5c95d19cfacedc1a0f7051591a89bcdef926e SHA512 75c43f414d132853badc63739c99afba58bc1f33c6f29a5ed7901b48e74a59172fe1523ee4cae8fcb6774983acb7c90a70b01be0517e573469eb027ec70bfd67 WHIRLPOOL 7f19bc2f3257e91108e17707893081a517a6fc465ce4e3b02b4babd672ffbf6c64adfe65c885bb6e67ea4e3cf59f98380a286fac1a47648e4cd030a31a689025
 EBUILD criu-0.7.ebuild 1250 SHA256 71cf9f51e79f22aaeff390dfac4cd226c3f180e9db9ae3506c01b2026c1f60d4 SHA512 12a51ae52094748310ec3f06cba846284185f7145ce023315ff1a66a05e6cbb35b1b159b54aa44cfc209a82ef62a6e8af52ceaae21a42c77887cf3ce523c8a42 WHIRLPOOL a4c66a26b14c36a28e3755dfcdb7199be7f704585824b2c3d48d2507dc87cd00077b4fabb9206c7546670e14d743d1c2fe536f249ee56649c54f53413808f602
 EBUILD criu-0.8.ebuild 1250 SHA256 a70d35bf37bed3c4152e3e9166bb2fef1e00214227e067da159cbea574143bbe SHA512 63c58ff917e827c08fe14faa386642d47373015ffd4624840c21de7a515f73cd76a0b4e176352b8bf4c07776d02b3f6bfcc2dbd227caa775d44737e75e9c3a93 WHIRLPOOL 8d68ff53b5a5e7ab1034f225f47760a7cbf498473703bc7cba4b3ddd81c037076e52ed532d9198ee19969bdc426ea6527aca2d17fdde4dc64bc8bdac969470aa
 EBUILD criu-1.0.ebuild 1270 SHA256 c6659d916898d5ee07276e7419693b13d971711b2f6dbead2bb4101066212f7e SHA512 fbea5e45c0835387f8a34ed7829ae4c41694152b2ac8ae9365a8317f9fea95a650b37b530a6eb85d551f2da832e6637280f73077f56ce311154e607b346844fc WHIRLPOOL 528fa2dfa0acee1947ebc30088462fe0305ddb1186d07df705e1e909765ff492721326c13edd363f28193a4541ec5e1ca8cc399b45af45beefb8e396e4ee0849
 EBUILD criu-1.1.ebuild 1270 SHA256 951e78cb9122d8340a23fe390692202d298b2eb1630bcf9b2de19ed1a63b562d SHA512 fd3cbb83e7a9295904b2a613cd5557e6861df120195adb2732ad8cc4212a3d74efa774824bcaf02eb11de1a894751e30e79f8c4b152f4b70692e419e42d82387 WHIRLPOOL 2ae110d16d76a0394744213950903ef060611a5cb4e6366b4f180f14fe4cb14f6e04af036e7873ec30725841ceb2ad8e4f988fec2759da944c9d8ab289c609e3
-MISC ChangeLog 1135 SHA256 44ee0be863ad879197e6c6fc331b93c64208c0dcfb771ee34a9df0c8c73a632b SHA512 c2bd67a0ac6c31c6923d436f238ed1b599edaefd1f9df44489441526d36336258d218fe85b78f433ec83d46ccde18f5a801c28a36bbde4ad48bcfd9281f14d69 WHIRLPOOL 5704cfbcdc18a6016b0d5bc1d282b2e121011862cf38f0390330f750a67ce4958de1f1691a13119d3ff6601f2afb434138aa9418a009bc96dff7bae54a0b4885
+EBUILD criu-1.2.ebuild 1340 SHA256 746ba4346257c51d4d65afb8c9e8d1ac26d6f8a088d6a32ecea1df84b2d0b896 SHA512 b43ab3f76317290a3fa850b888d6e9650cdd415d7ea7c3e9cc5943db6d4a397bb50e5709f9a6cd4352683ce4e49b87e691bbfac3c03b7cc392b19779d7459fd2 WHIRLPOOL 82c937cc1737f3300a4ee4d4ce13b0c79c6c46530b10391f0e6d35c97be38c2780b1603385f6ebc9d5b9f27ad9b738f5698b4b1a19a0fa16749b63b1752797b6
+MISC ChangeLog 1278 SHA256 8af215b0368d305778302232d9257d67c1c550a620a95f52a1e79e638060557e SHA512 ff37c1858d6471adc0550797f30ccd1b6faca9c4e769d31a9cba3db0baee152c8f585a5db1cc355593b287da8f1e4198d1d535bd21b95d9a2b7f9dcbbac83dc1 WHIRLPOOL 219284f6817d140e3d0c2510c2d01c05dae7e7267704ff758ec8604e9aeeb57e10363b86215ce7a7c660e6a5dab96e676619986d6344cad412a84473c1838c3b
 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTBJ53AAoJEEqz6FtPBkyjNs4H/iUswJvQPAa1bGxenqFXvmDk
-UzG2diOOxwUxUHKEcY00reeik47TFDppFnzDl+3vhbudrzc9+DTvZerrOejCnH9E
-hSgHQebZ3s7cOZ5poeyMZbQLbvnlaAUDiwtilb3lbqEWKZQehoInUHae/fxpGA+g
-Xk8daB/CXRuAuPaX5JKCw75jV6G5ROSZAy+WjSUO8vfwLiO0VS2n8GFg9TCG82a1
-u7sQXx9aHlu5HXFRliwM3qWahGQBOjbgh95CN0mRQpbGyWwaEYltujgRcaqdQPr3
-ya1ZKzBOe/N9bMxvN+qle29fMpIzH5G5csCID1V/aYBaJOTRSFKgfRiz987GOkI=
-=f6LK
+iQEcBAEBCAAGBQJTEXLRAAoJEEqz6FtPBkyjfAcH/ixXrCdWYUaXpKC461fiSjkZ
+Jfq6hX4tAWHc0e79gJgwYETTdvEVYMOLWLNAYnooRb2aN3c8uDTOsiFUTH1Pu2YG
+6NHzOZEqcrl1gx7JoxcmuMyqfUFnrOQV37mFUzc96rMkb71zbn5+PEFaRAa8wfAW
+AXzlNYTbbmEqpsO+49yJkgsv2I9s2rLDWpWI7LLbEpZu3NHb/UJu9uubq4HGrCVS
+jsIKQ1l74xKh1A9S71WbJ254YZxcLOf15+BWF31caYPktekP4kv9Q1TVp4/LTJGN
+HjzJgPmuiDBmgStZxzsXbJlHbQFOurgq5zSpgYnKQ8iF6lQdBe5byRn+mM2tDZ8=
+=afBf
 -----END PGP SIGNATURE-----
diff --git a/sys-process/criu/criu-1.2.ebuild b/sys-process/criu/criu-1.2.ebuild
new file mode 100644
index 000000000000..2cc64a39e720
--- /dev/null
+++ b/sys-process/criu/criu-1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.2.ebuild,v 1.1 2014/03/01 05:40:30 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs linux-info flag-o-matic
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="http://criu.org/"
+SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/protobuf-c"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.6-flags.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	# use raw ldflags for direct ld calls
+	sed -i "s/\$\$\?(LDFLAGS)/$(raw-ldflags)/" scripts/Makefile.build || die
+}
+
+src_compile() {
+	unset ARCH
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" V=1 WERROR=0 all docs
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test
+	fi
+}
+
+src_install() {
+	emake SYSCONFDIR="${EPREFIX}"/etc PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
+	dodoc CREDITS README
+}
diff --git a/sys-process/criu/files/criu-1.2-makefile.patch b/sys-process/criu/files/criu-1.2-makefile.patch
new file mode 100644
index 000000000000..784ed01db608
--- /dev/null
+++ b/sys-process/criu/files/criu-1.2-makefile.patch
@@ -0,0 +1,30 @@
+--- criu-1.2/Makefile
++++ criu-1.2/Makefile
+@@ -256,6 +256,7 @@
+ 	$(Q) mkdir -p $(DESTDIR)$(SYSTEMDUNITDIR)
+ 	$(Q) install -m 644 scripts/sd/criu.socket $(DESTDIR)$(SYSTEMDUNITDIR)
+ 	$(Q) install -m 644 scripts/sd/criu.service $(DESTDIR)$(SYSTEMDUNITDIR)
++	$(Q) mkdir -p $(DESTDIR)$(LOGROTATEDIR)
+ 	$(Q) install -m 644 scripts/logrotate.d/criu-service $(DESTDIR)$(LOGROTATEDIR)
+ 
+ install-man:
+--- criu-1.2/Makefile.inc
++++ criu-1.2/Makefile.inc
+@@ -15,15 +15,9 @@
+ SBINDIR		:= $(PREFIX)/sbin
+ MANDIR		:= $(PREFIX)/share/man
+ SYSTEMDUNITDIR	:= $(PREFIX)/lib/systemd/system/
+-LOGROTATEDIR	:= $(PREFIX)/etc/logrotate.d/
++LOGROTATEDIR	:= $(SYSCONFDIR)/logrotate.d/
+ LIBDIR		:= $(PREFIX)/lib
+-# For recent Debian/Ubuntu with multiarch support
+-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \
+-			-qDEB_HOST_MULTIARCH 2>/dev/null)
+-ifneq "$(DEB_HOST_MULTIARCH)" ""
+-LIBDIR		:= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+-# For most other systems
+-else ifeq "$(shell uname -m)" "x86_64"
++ifeq "$(shell uname -m)" "x86_64"
+ LIBDIR		:= $(PREFIX)/lib64
+ endif
+