fix wrong installed logrotate dir, bug 552612, thanks Alex Turbov

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

3 files changed, 96 insertions, 16 deletions

diff --git a/sys-process/criu/ChangeLog b/sys-process/criu/ChangeLog
index bb5fd21aca9f..ef5d6b25375d 100644
--- a/sys-process/criu/ChangeLog
+++ b/sys-process/criu/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2015/07/13 05:39:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.26 2015/07/15 09:07:25 dlan Exp $
+
+*criu-1.6-r1 (15 Jul 2015)
+
+  15 Jul 2015; Yixun Lan <dlan@gentoo.org> +criu-1.6-r1.ebuild:
+  fix wrong installed logrotate dir, bug 552612, thanks Alex Turbov
 
   13 Jul 2015; Mike Frysinger <vapier@gentoo.org> criu-1.6.ebuild:
   Fix ARCH & OBJCOPY handling for cross-compiling #552234 by Kevin Cernekee.
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 55fa4c8bfea6..ba7aa49b7579 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -8,23 +8,26 @@ AUX criu-1.5.1-arm64-ptrace.patch 341 SHA256 777bae08b06dae307b45f6027385085dcb3
 DIST criu-1.5.2.tar.bz2 457573 SHA256 e8226018ac6c4094d61a1c002543e2b2253b4041a8edb24d4c1eaa41ce5ab345 SHA512 c7916fde1f63cb66a89e71867c204a251dfa2b9de703ac467bc460c6f0d895947996fd466c17cb529d2502aba7b75b8b30162baf3944fefebb71625fb88e5458 WHIRLPOOL c951692e684bd1b032bde1b534a4f4bd4b769a1e73afc56c74711ac943da907f638489205e8be2c68bbc345c1da8b641a7175dccd34aad907ca3251c3f2156a0
 DIST criu-1.6.tar.bz2 484513 SHA256 35ba6f5df90bfb8a25ae5e53459272bb37b8a69790e084f86d7a9ffa0df35993 SHA512 0672c7342ffed7c23fdb747b7bd3b08f205a4bf3965577991d007f71e70be5243247e52ad823f0099713f7977f6f4be5403ea2073a840b5024b6a0f240f65bdc WHIRLPOOL da5a767b3f89efdd2cda21331cc60e60e0cdbab163a55ef1a3080d3601df924688d612c7e76000c3d383cdb22002b16c28ad2740b7bc6aba784021f31ebc54c4
 EBUILD criu-1.5.2.ebuild 1388 SHA256 125b7d030592c13b3ae4b4120852443328db63a23ba58232eca27340ffaff5b7 SHA512 d0ac03af4110e8e3928a44d20daa9f14ec21d7f54a7bb6b9f203ca7f66367d15a92170eaede4494cfa697cdc2200d039f4326c00f7ffd39a7693af099a4ac381 WHIRLPOOL 67377e78eb161287b12d1a22153e95838a7e9279dc069515555c1018bdb9cb82844b0bdac72388296a5c69565329c0c12a496794a9d0656b902ebcb143a89443
+EBUILD criu-1.6-r1.ebuild 1739 SHA256 4203567fe8ef398988229bb45d94fddd5acbe2b351138cd991c4d4e2779cac69 SHA512 3543c01ea640f1cbace475002a9dcfde3d58388917a3f051dc8bdef313379de0cac35bc71c89d99432ec440c0bb690203e19e641647014cb3d832d412d0bcfdd WHIRLPOOL ee200832d3941950ceb619b9c8d3b1b5436fdf25b6b6655abb04af0d69dee458541ac95ef7f3a96ac5b7c6b3847b26e808b6685e8b28528c3907c04196ec22ed
 EBUILD criu-1.6.ebuild 1723 SHA256 30466df09cd8adcd862fd5cbcfc2023431391a728a36682125f1bfb46f29378e SHA512 4fd7d244883fbf0fde10a6c85a8f95ef9f2d49a7d9d2c9df19b121aa24974a8d3672360134f5af55713b44b930a4cd427d56d84f73038c0f4df40107d055e03f WHIRLPOOL 2e4d8d2168b9e9567ec4014c9cc6de101e20721cc9fcd0299becb02f2a893711d7415376d9cdccfa3666182e317ac03859e89bb7d829ebfc3ca40911ed15eec1
-MISC ChangeLog 3724 SHA256 af11e745ab8753131394509b79e0a251bad2bf7b185a91d2b01463dfa0c1348c SHA512 d91016f93b2a469a77f7f2d5faa48da3347ef8f7b69649a3e6be1f6bf51a7a3270ef4c7f3722529fd06135615cac72ee43e520329bd63ac7873ceafad8fdfecb WHIRLPOOL adc87f4f694e6cb3f3a8355fe8cf63b606744e7b519294a8317aa574e5037a089ad4bf4861fff214693bab455b055b4099abff07ff6741135ffc4e6256c73f8c
+MISC ChangeLog 3883 SHA256 028afdb1daf0f55549762c3e321cd313c948bdd51aa0d52cb0608cd141fa12c4 SHA512 dd026f345a8747c8482f5369bcec3d1f11eba2e08bb7705f12dc09e7b77900ebc3b7c9f072541c4b1decaca93b6d37e89187ae023333eafb9fbbda864c901476 WHIRLPOOL 5b760c61a8164bcecd1ee6f63ae8fd87d93dd91483d5c78c02d6da5312225b024d98a96e5d1798b7f0b1f17e9bf9c24e4e3a17797f0561c122899e9d27db4426
 MISC metadata.xml 367 SHA256 d9d70f8ffaabb1d3c702b245cd28bc33bc312244bb3dd465c8d56c11db44f739 SHA512 a31e9e6c490917e5e0a9d038cfadcaf57118e12bba936e2ce522b06432ff4e891e0aca8f048c772c882034b87173176539ae502ad043f10e9b0eb2f00667181b WHIRLPOOL cfd118b2e4c7fd7fdcbfb82a934ba6572a8b09927f483b9b2cfa8f46fe637ba05a1934e7f82c5ebf64588c0a65a611eeda58f3ef082d54e77be4ee0599ec9fd2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVo08qAAoJEPGu1DbS6WIAmDQQAIcCcnmeDUagFDoiI0zf8DH8
-iniIZpF9lmadsAEA1gtcO5ygxrKPV404M2IoPID1m1vMW1pIazq37nlQWgu5RCxb
-xCznoiEiu9+DGQKLuKmjjsJVHelf/0hdF7qV+ia6DYt0r9gzmGyNF8KHOikGnQBq
-RpjE36bEUDLMrEjLGY+QlrvXFl1CPkjpVJIaM76ULKQQ5h1Qm6nUIkiP8H4tW/oB
-h7Va9S5Sn/pkn5lJTCGoBI54NpW/8Z+MmZS2MPmLGmiWaoyXs32yYNzm8ftCtk0K
-mqQuyYQOr/OUF7YIYtKYgaNYZ3ghKWxmGHJkcZE6AKz5WMYJVn2f92ooonwnkNb+
-VdyRuPxWi0qrUR+sDdaU5LG5RoT1Sy4PDVoeEJWkglvrMXFCvKr4u+grjfBNzrGS
-+jcc+xsgvyTv61qmyh9cd2OadB7JbYS/IqzxjqHLTXHrA8/6ECayxXee+Fi1Yz/F
-AZ1O4bL7afZEDY0psFu2uywE8ZdWy0C5Mp+SSNs8lJm/nLpHI2EQlXG1NzqEFPu7
-TtpCjeDQaWsA/4+0AuTrKD2PnCjyBpdSUGNcpsIZiAX2E32tg6pvM/3G4uRLa2KM
-n1WDijODS2pqUsrV597GOuqBo1lgv/+v9UTo88R9hpg3S4i4TKiQny8bx9fvV0B3
-CuM/TBEUDjKL6eWTmj5M
-=44fj
+iQJ8BAEBCABmBQJVppNhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtH70P/3CPe8cHng4x6kC6h4mAPuYJ
+rm3eegq1OJ5msSGwap90RH4/8x4Zg29COIf++wKwworpXtXe7flIR1OsPnG7lPSG
+FuswrHy0AZFCFWWKfUvaZKB2hPXmsQxRDJVtSLx9k2KiKHQ5sVaJcyuzST9oNgMs
+b9wZD+hz8s0RxqIWGpumU/6jIzP4057q79pJCgdg3clnAFBM7qCAagRtKpq030lH
+/h+VKqDnkmxfzCm9QCZJyYZn20hGlWugIBzFNBGQ9kxBMzc+/rOe+nRtwjdzYsIN
+2k07Od6uB9qhjRIaGHp2UwnvH74Yyp7YFjJTij+f1zzTZ9XCNmxMaQA5rr7mhQ4s
+gHK1X1P6wa9e4YcljGHP7oeOgsFI3hKFDVoWmrpPqKOfRNAqqkKZWzQhwvXJltbq
+6dBH6jGYR2SPUIdlU2W+fqeByaP/v4+ucFcbyFABlQT0UPO2jhkpT3lUc/y2qw/B
+CYZxEU/VfZ5WEMlfElOquv7qbUB+FdOcxzSte+prYs9xxnopPFkEakdZ8bGKWBj+
+0KFxRGGSawpDXnUe0M6DVBM0Avluzp7NP//iUIoSdC/I8TorX4kXmYO9MF0YUe4I
+5RZfOO0CxU8REJVVrC2HnHAvv3gmHeDeCwTibjiytyAzznai9UxaACi7CupTSZzg
+NY/vGx0+0AN9iE4VPuUw
+=zEll
 -----END PGP SIGNATURE-----
diff --git a/sys-process/criu/criu-1.6-r1.ebuild b/sys-process/criu/criu-1.6-r1.ebuild
new file mode 100644
index 000000000000..a0ae69a34e1e
--- /dev/null
+++ b/sys-process/criu/criu-1.6-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.6-r1.ebuild,v 1.1 2015/07/15 09:07:25 dlan 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 ~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 \
+		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 \
+		ARCH="$(criu_arch)" \
+		PREFIX="${EPREFIX}"/usr \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		DESTDIR="${D}" \
+		install
+
+	dodoc CREDITS README.md
+}