7 files changed, 123 insertions, 105 deletions
diff --git a/sys-apps/proot/ChangeLog b/sys-apps/proot/ChangeLog
index 398435bc4198..034716a590a7 100644
--- a/sys-apps/proot/ChangeLog
+++ b/sys-apps/proot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/proot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/ChangeLog,v 1.5 2014/02/25 08:15:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/ChangeLog,v 1.6 2014/03/11 08:13:00 pinkbyte Exp $
+
+*proot-3.2.2-r1 (11 Mar 2014)
+
+  11 Mar 2014; Sergey Popov <pinkbyte@gentoo.org> -proot-3.2.1.ebuild,
+  -proot-3.2.1-r1.ebuild, +proot-3.2.2-r1.ebuild,
+  +files/proot-3.2.2-build-care.patch, metadata.xml:
+  Revision bump: add support for optional building of CARE binary, wrt bug
+  #502388, thanks to Patrick Lauer. Drop old
 
 *proot-3.2.2 (25 Feb 2014)
 
diff --git a/sys-apps/proot/Manifest b/sys-apps/proot/Manifest
index 52304c4913c9..644ec672bf66 100644
--- a/sys-apps/proot/Manifest
+++ b/sys-apps/proot/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX proot-2.3.1-lib-paths-fix.patch 700 SHA256 e85bcf46445a09eaa124a8446e41f9ade9367030761dfc0a9028778c36ee3703 SHA512 90c5b6fa8d9e98de79d2c1344508a82be22ccc334cfcf8b6d60a2004a445a1c683fa538dd57958ba6491e26a1997fcfa8daa44f3a8001424470c85ece56c34a9 WHIRLPOOL 2fa6f9017bb7c2972199e84e1abc7c54f7b5bfbe987eac5fb7e38741a89c9f822a83a4da49a54c61c6279407746c120d8aac0b48627d0387cc333347508d6f36
 AUX proot-3.2.1-makefile.patch 327 SHA256 65c4a51860444d37fd633486cb53a34f9630ed143d1b28f681c82905dc6ee463 SHA512 8c1614b5c47ffddbbf59f1a47d60d7fa43c03a31612a1b8c699c8ea9c0a4f319ab326bb713e0c0dc6bcb8d7b38282a181e89f7429c7aaccc7340da0769235a57 WHIRLPOOL bc94159a67f0b67f11d475b29764251ad77a60a8d6c9c33bc85c7eb4de9540eaaefdbf92425c57a9028bdd87933e5945c88bfe06b52aba267d8fd63f98b0609c
-DIST proot-3.2.1.tar.gz 150884 SHA256 53b073485e3d4a38be6cf4b9d037d232b6340782ad89c666dbdbe06ed9752da9 SHA512 a91600aee82040d04e9179fd35084ea9cf22422097e1fb5a5772e5a4fead62d905b84f8393e88dbed31b0a2709538a5274e22148825fa7cd18ded80998f01493 WHIRLPOOL f15d3571fcfe42f77b4d29b2cfe385695e82d3d1608edbdf16426986e1026eff7be01dee4503a385d0ef1464049b7dc30ffc710fab480c5ce88f56299a42bd2f
+AUX proot-3.2.2-build-care.patch 630 SHA256 81052a0b2aa34251da73e7d599f6fbdc06a42cd422975be1b7c3a613e725d734 SHA512 394d647a9b5054ca31b7c18a0993adb9d811123cc54fb9f9ea5560016562260966e61f73f3290697af1dc141482dd75d3bb4cbb7c84995af58e246f8977169b6 WHIRLPOOL 5d0f5540acdcf816d7b07a7d9a596184e21f50b5424c4f4e67556ef00eaa8bc4b2184d41b11e437dc56d8d747972a16002ed9ce573e24c58a02d1a58b01fa457
 DIST proot-3.2.2.tar.gz 171047 SHA256 481296465027c48de8b8779c4cdad57948c765139f2a17b25590068b8d21a111 SHA512 baf8df06a463978f0faf36f9d81935d6583b99b7e8c54b8ac330478ed92bb3a5d5cd624e028247c50bb9bc6fbe1300c5736a38c0aff250b23614aa52f922dfdd WHIRLPOOL 426c1b2ee6f6ee9ecc3f0b056d3baaf5269c894c302449dca263a1fe45c94d2e76bc07592fd88b9556554550653495fe1ce81e5021b1487e65239026fd23b962
-EBUILD proot-3.2.1-r1.ebuild 1089 SHA256 fa59c30e7fa93d8ad8ff0e7f2fdd133a97a47dec9144c328f9b12ccb9ffcb2fd SHA512 abebec32ee958f00a06ce0ceb9fed8a7ac99d42cc9bb023a39f35d0b7a040efdf1a5f3ebf437f819584a4af47a2a47a84ecd283117149d2c530181a886021d0d WHIRLPOOL f1373e8736ca0c52d5fd0ba2e2104e15ea9fba3854e1a7258a0df06dbebe07716f636d83b505b0296678197a1e7afd26ba5f59f71e04fda65afca50f46748fe6
-EBUILD proot-3.2.1.ebuild 1020 SHA256 3dcd73030ee1c93182ca5d4c8d48f430a9df419d7f30db59924e46eaf94e786f SHA512 d42bc8f41be50220db7509b1b05b6539ac9aa915c5ce86da955fae369a2c1beb2aa9fdb0942a93ef14a32b104d4c25afa56a21c93a43e2d0785aafa2cf7be1da WHIRLPOOL 674b4e75e41705790117b462a1fd2441d3634c687ecb1ccdf3f63eabbbc5fd983ea38d2982fa6b6e5ff263bddb5bf0fef2875777a5062900be712f9d49a8a4db
+EBUILD proot-3.2.2-r1.ebuild 1783 SHA256 3e9537a4c32a806dc174f2b92006ad1a4c471d138ecee9532f120d13d23d542b SHA512 2b27dc6471931c7dfa8bd23fe9db33c56a4e67481669b7b03cd56397394dd035366229997e7b87fc6d0133fd327f6723eaab671217f21c9f89920e723afd48ca WHIRLPOOL 624a392f99901d1f9328fa62f48a3fae0d3f3931e82387f229ecda13406d20ab0d8f5f61b53892e6eb0d50cb2c216619c02c8f96ff525a1815149f3aa1765815
 EBUILD proot-3.2.2.ebuild 1092 SHA256 8a7e7de75e3e4122c5271fe17deef94c45f1258a68b0893892318965580b3e48 SHA512 93a29d791b619464a6158103d89a28b80f3b066b614aa9c0c092b3e9dbf12061643de1e2b5dd0ed7ed03568bcaee99a650d6f98727743840a45a530ac8723b58 WHIRLPOOL 34e14c0cf9a89282307c5fc35d11c92cfb461f98c5d9479c49108057f22003a05f2bdadebf8575affe6ac24b8ffb9ad174bbaf1db870f5b616a5b30e43b8abaf
-MISC ChangeLog 1160 SHA256 e9ccd9a859021a0a739d5b8e7f2285fc524bf2253a0835c200ea2f2016c63454 SHA512 e3ca053f1f0202f8cc9275ceeb0d024a157c6177dad859dd53d79fa492da9364c8fbe51084f0651ffa80a4dfa274652a1d6f5c182dc2a1d6b0acb0678bb65cf6 WHIRLPOOL 5e77063263b7be79e771c20315d2767d2c32721853c759cd57b4307320cacf82040c09b68412abb72bd7e7a1c88148beb3423e42bdf79e2f243425c093d587b1
-MISC metadata.xml 658 SHA256 1e806c467ef36ce12640239fedd87d285fecea76f2daa567bd5f4a72ce6b8f3a SHA512 1d5d3846b5edcd027df90a21b168eebc1f092f95840d5d60146e3ac2d05b70b0b75fd6df8fba1dfed824e307c82139f9c8ea94414071082ad0c93aec00306821 WHIRLPOOL 85ff13b91832d227b51690100696a202580f925f633a7deefed55cff624da0c0881a5b28202ce26b311e2443aee169788c9990366f499e90cc0f3b1e5a6746c5
+MISC ChangeLog 1487 SHA256 90af0312b11b239aad5a96524da5fbde764c7cb2ee66ffaf73b4917b6088e57c SHA512 3994693e0ade52f2461849174ec27996de87b01fde904f25139fff8d5d14701aef0cd4b69b4235aa32e7cc1b570dcdff1dd69db1610e524ac8af9f17065869de WHIRLPOOL abfa2f859fb487e4af0b4da2711916fdcba053ce53b2f745dd7572aac2bbe6dcf87a5c14fd4d3ecbc2dcfc015c20e5ac1bc60db48550c113bbe253acbf0fad21
+MISC metadata.xml 764 SHA256 808bd8e5d192ab52cbe815b85c53460919468a62771a5479e17ca3f0ab266816 SHA512 2fbea396946cac61fb4bbf1f862a2961d0229a24931d75419cf3224fa10c5dbad031fd27303ee222cbcccc10db8ee590463720789f9998ef6ff6a4f672d0d5d1 WHIRLPOOL ac3b6f5b0656068e29d89f97cbd1aa448b48bbc2024f0f44c166d3b5134f65676480165df5bef8375330ffed5e7be1a2c3c4220670a422995d0b07a091174c5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTHsWaAAoJECo/aRed92676OEIAKZ53q+7ZfEXumLfNySqUa/t
+ExWASm0W5OT7Gs/0MPLjGcogq8S0GLyFCYmHG6salPV2A0YJJ48AtgZjDxnaPHcC
+5tnhiQFQhEvgrr9sA+9i/HjjdYsNi+Cd+iET2ifKhnII4/CUcdZFytQtC878YH0s
+7ihU3vbsKnB1asao4SWyZXyUcliFsCfSRFzrfCUMZw91pwLl1lx9TcJLxj9pWRRS
+j1Qw4Zn6GgUUN+KQMMMqzpg9M3gKPvIXDiKmjAWWVGk6m+v6Lyt8fhCl/JOOvIeE
+vwGU8pC/QWErvB4/yQ36iVJjQyLZ1m6xcDy+45LLJHHUwDYB8jR6yMIyyJmrZYc=
+=75vp
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/proot/files/proot-3.2.2-build-care.patch b/sys-apps/proot/files/proot-3.2.2-build-care.patch
new file mode 100644
index 000000000000..c52a39cf787b
--- /dev/null
+++ b/sys-apps/proot/files/proot-3.2.2-build-care.patch
@@ -0,0 +1,20 @@
+Skip check for building care, patch by Patrick Lauer <patrick AT gentoo.org>
+
+--- src/GNUmakefile   2014-02-25 16:42:04.336863622 +0800
++++ src/GNUmakefile.new       2014-02-25 16:42:26.063050467 +0800
+@@ -54,15 +54,6 @@
+ all: proot
+ 
+ ######################################################################
+-# Sanity checks
+-
+-ifneq (,$(findstring care,$(MAKECMDGOALS)))
+-ifneq ($(CARE_BUILD_ENV),ok)
+-$(error care is supposed to be built with: http://build.reproducible.io)
+-endif
+-endif
+-
+-######################################################################
+ # Beautified output
+ 
+ quiet_GEN = @echo "  GEN       $@"; $(GEN)
diff --git a/sys-apps/proot/metadata.xml b/sys-apps/proot/metadata.xml
index 7c21087ca5ab..9ad8dbdff303 100644
--- a/sys-apps/proot/metadata.xml
+++ b/sys-apps/proot/metadata.xml
@@ -10,4 +10,7 @@
 	This means that users don't need any privilege or setup to do things like: using an arbitrary directory as the new root filesystem,
 	making files accessible somewhere else in the filesystem hierarchy, or executing programs built for another CPU architecture
 	transparently through QEMU user-mode.</longdescription>
+	<use>
+		<flag name="care">Build dynamic CARE binary (more info - http://reproducible.io/)</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/proot/proot-3.2.1-r1.ebuild b/sys-apps/proot/proot-3.2.1-r1.ebuild
deleted file mode 100644
index fb5500d1e550..000000000000
--- a/sys-apps/proot/proot-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/proot-3.2.1-r1.ebuild,v 1.1 2013/12/23 16:18:23 pinkbyte Exp $
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils pax-utils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="http://proot.me"
-SRC_URI="https://github.com/cedric-vincent/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="sys-libs/talloc"
-DEPEND="${RDEPEND}
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${P}-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
-	epatch_user
-}
-
-src_compile() {
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true"
-}
-
-src_install() {
-	# Workaround for bug #493416
-	pax-mark -Emp src/proot
-
-	dobin src/proot
-	doman doc/proot.1
-	dodoc doc/*.txt doc/articles/*
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
diff --git a/sys-apps/proot/proot-3.2.1.ebuild b/sys-apps/proot/proot-3.2.1.ebuild
deleted file mode 100644
index 85bace571c85..000000000000
--- a/sys-apps/proot/proot-3.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/proot-3.2.1.ebuild,v 1.1 2013/12/06 07:09:12 pinkbyte Exp $
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="http://proot.me"
-SRC_URI="https://github.com/cedric-vincent/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="sys-libs/talloc"
-DEPEND="${RDEPEND}
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${P}-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
-	epatch_user
-}
-
-src_compile() {
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true"
-}
-
-src_install() {
-	dobin src/proot
-	doman doc/proot.1
-	dodoc doc/*.txt doc/articles/*
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
diff --git a/sys-apps/proot/proot-3.2.2-r1.ebuild b/sys-apps/proot/proot-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..c93b0a577f63
--- /dev/null
+++ b/sys-apps/proot/proot-3.2.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/proot/proot-3.2.2-r1.ebuild,v 1.1 2014/03/11 08:13:00 pinkbyte Exp $
+
+EAPI=5
+MY_PN="PRoot"
+
+inherit eutils pax-utils toolchain-funcs
+
+DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
+HOMEPAGE="http://proot.me"
+SRC_URI="https://github.com/cedric-vincent/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="care test"
+
+RDEPEND="care? ( app-arch/libarchive:0= )
+	 sys-libs/talloc"
+DEPEND="${RDEPEND}
+	care? ( dev-libs/uthash )
+	test? ( dev-util/valgrind )"
+
+# Breaks sandbox
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
+		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch" \
+		"${FILESDIR}/${P}-build-care.patch"
+	epatch_user
+}
+
+src_compile() {
+	# build the proot and care targets
+	emake -C src V=1 \
+		CC="$(tc-getCC)" \
+		CHECK_VERSION="true" \
+		CAREBUILDENV="ok" \
+		proot $(usex care "care" "" "" "")
+}
+
+src_install() {
+	if use care; then
+		# Workaround for bug #493416
+		pax-mark -Emp src/care
+		dobin src/care
+	fi
+	# Workaround for bug #493416
+	pax-mark -Emp src/proot
+
+	dobin src/proot
+	doman doc/proot.1
+	dodoc doc/*.txt doc/articles/*
+}
+
+src_test() {
+	emake -C tests -j1 CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	if use care; then
+		elog "You have enabled 'care' USE flag, that builds and installs"
+		elog "dynamically linked care binary."
+		elog "Upstream does NOT support such way of building CARE,"
+		elog "it provides only prebuilt binaries."
+		elog "CARE also has known problems on hardened systems"
+		elog "Please do NOT file bugs about them to http://bugs.gentoo.org"
+	fi
+}