Add setproctitle use flag to fix automagic dep on dev-libs/libbsd (bug #540744).

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

5 files changed, 101 insertions, 10 deletions

diff --git a/sys-process/criu/ChangeLog b/sys-process/criu/ChangeLog
index ea05c561697f..a7d1bdf7dec8 100644
--- a/sys-process/criu/ChangeLog
+++ b/sys-process/criu/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2015/03/11 22:03:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.14 2015/03/11 22:38:29 radhermit Exp $
+
+*criu-1.5-r1 (11 Mar 2015)
+
+  11 Mar 2015; Tim Harder <radhermit@gentoo.org> +criu-1.5-r1.ebuild,
+  +files/criu-1.5-automagic-libbsd.patch, metadata.xml:
+  Add setproctitle use flag to fix automagic dep on dev-libs/libbsd (bug
+  #540744).
 
 *criu-1.5 (11 Mar 2015)
 
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index cfd1668964d4..1105091357c2 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -5,6 +5,7 @@ AUX criu-0.6-flags.patch 1408 SHA256 e0b6518b5db4221ccd2ed774cefb6169afb30e4826e
 AUX criu-1.2-makefile.patch 1048 SHA256 ed6e886715635fc919df1e7cec398f22fcc8a630219d6747ef2f071d4c7a73c0 SHA512 9547881e921c71c8498e733766e7e42bb392a2bb86a83caa469db6c8d5db3c6badef310903b2dfd3d66ff9613c4623d0f2afc20c6cb96c734e3572a63f658912 WHIRLPOOL ce145ebcfd507c8af65ac6252d2838c4891d5a56fc66de7c1640965ea251e07b1904035311d4384a95799b75347c0aa8e8313d96f01744dd4c608a7ad02403cc
 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
 DIST criu-1.2.tar.bz2 335531 SHA256 3ebdb544690f75c3e0f70d9af4d09f4f0d654ecea59e14abe3a5c9f536b6b413 SHA512 c7b9bcae46a262ae566108aea3a2b25560fbcd3c54803a37d4392ff0b5b993f273a4c2fe197b9f03f4f370a8cceaa9481bd73d5cc89833346e1b5b5ef8429dec WHIRLPOOL 9a8c2ffaf62923d4c1d230170aeb3dac4d3cd3adb47fee4b0591b5bd3135d7b993cdc726f33d193838d33ff61ac50bbd0185a913bb64dc712e53f90fff6475d6
 DIST criu-1.3.1.tar.bz2 399588 SHA256 9c9017b64b4a63ee74cec104404c965459e13752726024a96a4ec11d331b07f9 SHA512 66845080e5d76e7c1685a914db6abe8a9cb7b94370a8af188278eccc3e3efbb601862f4053712073948eb8fdd2f7468e8b10b933f81f3f6c375ef380a878a681 WHIRLPOOL 4b159d1f7d325ae7c73b19b429bf523695f2744442940fc15195db616d70ff1b64b9e2f0f4dfebb6b04be8c885c245b5a4bf7432e0cf90f11352f63481bcbc0f
 DIST criu-1.4.tar.bz2 432735 SHA256 757347b3bfe824f93b9a5c98e60dfac5a73da978eb7ebd29d721dea496eaf789 SHA512 af7aae488bff97d6079cab9d01a64df7adc21c146e56a7c2429d7654aa86a0a1d306bbb828210c0d6badf82177b3eb37541472e59ce2b40783dde9a11df76403 WHIRLPOOL 02c5fa23ca250d3a9d15d3c16a54c0f2c082d5103934c3eb03d61988013bbf4f6b8fe69524b07438e4761b4c829d6f9666c09bd367b3569014e1f0c7e6875a5a
@@ -12,17 +13,18 @@ DIST criu-1.5.tar.bz2 457323 SHA256 c848918d5b67f68efd25224bc4a7ffe9252d039fc6f3
 EBUILD criu-1.2-r1.ebuild 1346 SHA256 016e9bb351d5dcd430819b483f4efc1479291a1323932070f079b13901e2ece3 SHA512 491b32afd9e28d1d1a6c60c510924cd775d1b9516732ed3b63a4741e907c75a352ec53a1f4f7dfe76a7feebc61294ba071b3b2724afd0b916bcdd5df631a4f3c WHIRLPOOL 312191f737a239f884388d9de806427457a1b9dacee01db92eb2eb1ba89b2a0a81a998d963e244c774fec1390209b1ac3ee644e7296d27e728897483504bbb2a
 EBUILD criu-1.3.1.ebuild 1226 SHA256 189b5cf17b130cf4768d92775b3b0e257724c74cdf20724febb45311547d191e SHA512 0fe4a28c31f7a03f03dce2a6094e8a7d5157a714d2494a2abba1b8cb9d4776aa28cd68122c7dc724b4176154a80c44dcd15dd2bf2c8e00bfbf111c1d4cbde6ba WHIRLPOOL 8fbbff75090344d6ad2a89fdb2cebfc823f447bfa5274211d30143913588ca1f50fe1617bed4300353196b9ce010156e9b71730388266b7a01b82634671bbbdc
 EBUILD criu-1.4.ebuild 1238 SHA256 4e6ced8e72d3c7b94cb5190abc90b093015cb54c04b659f92f23a0973c2e21e0 SHA512 977ca256b8bc669e97b21362b674c0ac9f117ed60b8194c2e724d70c902b145c29f40284b565ac3d57fcc54a4c55958b74a515222b799d2d78ff6bc9ac7eee19 WHIRLPOOL b92675eb89900725b1b999ed213b7b39cd1df7fe3f113f3109583ddcc7f8da7df83e09f28c4d1643e6a9b84652d545155f3c30a3576ecb5a581ddee769068db8
+EBUILD criu-1.5-r1.ebuild 1384 SHA256 41ed7ccc5ec090e9528b554096dc28d910e250111a51681d53fec88f5b36d77c SHA512 48f23dcecfc0c491150c3efe0c07773b08abac9ec740125643148bb8d13b3d4859488b7705f58395032a7b737b330297c8efa2eacf8d034b0985e7f6f6db893b WHIRLPOOL 506ec37ed4faf4393b4f63a2d8d58db417880dab3f3528e60a4f5794ffb511620259d5f5cf3ac641f5fc046f711ea0409ddf7ab8036e8df3e2150b228fc78b88
 EBUILD criu-1.5.ebuild 1242 SHA256 6999286dc3cfb613da4154bf369cf4985adce541ff7e10a1803c5c873b0ec0aa SHA512 0748aecf1b6322eece459df515fa9948a55e244416c2bdae95e634d75a003f9ecb27b992de148654582c3533cadb785f69f3ff44b8d5e8017f94460d3b822761 WHIRLPOOL 67380e7c08c484c6cc2f9c931ab9447ada0145e0fe580a7c5489f31ccd106e5a73cda37a214239e8bb89e084cd6833ba80788da87da671bb32561fc2ec0222a6
-MISC ChangeLog 2063 SHA256 67f629da0e8cae9448a375e3db2eb66002060735d1afe56e7afc7837770068f5 SHA512 0bbcf6da430cfac5b2045b0c76dccd56685e558dfaaede6091937e47c89bf4b2c880db56a3258536e843706aded2ca9cf61e80d1894ec0e38f73ace923b78999 WHIRLPOOL a24f98bb6d0d8b3f984c706972d675563680d9a55f073cea9a563ced9548ebef569925ccc5844212527ebe3477a83f7f11fe222e7ff9ba94d00a18869b7a0a3a
-MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
+MISC ChangeLog 2303 SHA256 86883e9947d4e35bd75b49ee2dfd5b10f739ebbaf5d264e5b4ebca102d13a51d SHA512 0e6cad6f6ec02d8c6d1dccc1ef3257c621cf5c98b10a4d7ebec73b60cf088999da6dd7f6957ac1feb1f149de8e601a6b80cea823735bf0830bf5e2b896cf8fa1 WHIRLPOOL 5972fc119cb7a536fb0fe2f2431a8ac4c5e437d11ee7a554ab25d0e54fa2d690f1d950c5965d8314225a37179bdf23334e9cbb3796e2d039467a3f857a573e48
+MISC metadata.xml 344 SHA256 be943d06f784a682d76d9d6ecb276494179d9efc7f84fc3faa008494a4871554 SHA512 2f4ba95efeda64616346a5ffaedb36961c9277faa9cf63e6dd08e7ce56bdacca855bd6e2bb50f52dbde3c61803a5a934cd81e24266fd2ea44c3864d40f204f0b WHIRLPOOL e53ff3573c751ea2853731eeca3a7626a14d7d8b3034ef9ec1987fa13d53c9bbe056ee84748e9eb938c93a946352c0645f1546620cd8aff6848e34ccbdc4b982
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVALvIAAoJEEqz6FtPBkyjPUUH/iTV2hmJpLpRzQmRFC+DrxCs
-4YJGjWsqaxN52ngJ9tElI9v26fs7OLtQEE4U7qLTr19vIOhDvjhzQ+/4vdnu06d3
-9tzzHgFXjgyUFs2uOCI5DYYT2SFrIdLEbR/gYFPhlMLYR7rTYRoj+jovLkU/1XeZ
-Dqa1htYYQ1Yz0r2X/wpO7osHp18L9bhkn8RVu1xC+pHjB+EOIr9sOtxxsl4H9htE
-qXJoywn2PoQlIYoWq4gfRuEyQENB5XoxgXiokZLd9YpX9NNmko7rDI3fJBaMQBv7
-tLmIET/RyvcpOFe1XgsmhI4bNx0ILzzl3VT1aVxZHGBejstyw8IkgW+5V2XdvjE=
-=grAc
+iQEcBAEBCAAGBQJVAMPxAAoJEEqz6FtPBkyjPt4H/0S7yqOjXyBv8q6I4T9EsK0q
+diVgulkhE1H89Hv4P3sfWkVntPWmLsAsVWb+gVLNN8ACr5cYmYCm6rBnZDtq4Kym
+xFcwmKIvgdyYEqidqKq5vvD4te/WTqxT11tT+u1M5kCNRkS+va1L0oDyzCTKKAxl
+DOgspbfAvDekGbzC6QJynSLk1F1ZofcniwJeN1o5c514b02U68DP0cdHJnmTNDKy
+JclqaJ3y2FtHy1AE/ZgO2ipeBikgjBHqy0EYgAP2PH0uhjhSCVOMivEsDyHG+8C5
+EjXWqPIhLZbgh7VbbWMXtM03lzXiYKBrUHywzdGMJhKJvEH6DhoOZ2/oN7iT9fo=
+=XIvg
 -----END PGP SIGNATURE-----
diff --git a/sys-process/criu/criu-1.5-r1.ebuild b/sys-process/criu/criu-1.5-r1.ebuild
new file mode 100644
index 000000000000..50fc8327d21c
--- /dev/null
+++ b/sys-process/criu/criu-1.5-r1.ebuild
@@ -0,0 +1,50 @@
+# 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-r1.ebuild,v 1.1 2015/03/11 22:38:29 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"
+IUSE="setproctitle"
+
+RDEPEND="<dev-libs/protobuf-c-1.1.0
+	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/files/criu-1.5-automagic-libbsd.patch b/sys-process/criu/files/criu-1.5-automagic-libbsd.patch
new file mode 100644
index 000000000000..8f5e4b4e02d0
--- /dev/null
+++ b/sys-process/criu/files/criu-1.5-automagic-libbsd.patch
@@ -0,0 +1,29 @@
+Control libbsd dependency via SETPROCTITLE definition.
+
+--- criu-1.5/Makefile.config
++++ criu-1.5/Makefile.config
+@@ -3,10 +3,12 @@
+ 
+ CONFIG		:= include/config.h
+ 
++ifeq ($(SETPROCTITLE),yes)
+ ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y)
+ 	LIBS += -lbsd
+ 	DEFINES += -DCONFIG_HAS_LIBBSD
+ endif
++endif
+ 
+ $(CONFIG): scripts/utilities.mak scripts/feature-tests.mak include/config-base.h
+ 	$(E) "  GEN     " $@
+@@ -33,9 +35,11 @@
+ ifeq ($(VDSO),y)
+ 	$(Q) @echo '#define CONFIG_VDSO' >> $@
+ endif
++ifeq ($(SETPROCTITLE),yes)
+ ifeq ($(call try-cc,$(SETPROCTITLE_INIT_TEST),-lbsd),y)
+ 	$(Q) @echo '#define CONFIG_HAS_SETPROCTITLE_INIT' >> $@
+ endif
++endif
+ 	$(Q) @echo '#endif /* __CR_CONFIG_H__ */' >> $@
+ 
+ config: $(CONFIG)
diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index efa5eb0078f3..39d397d2bb14 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -5,4 +5,7 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<use>
+		<flag name='setproctitle'>Make process titles of service workers to be more verbose</flag>
+	</use>
 </pkgmetadata>