[gentoo-commits] proj/virtualization:master commit in: sys-apps/firejail/

[Vadim A. Misbakh-Soloviov]

commit:     616fb06479a19d24c10742cba4589109a53acacd
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Tue Mar  7 15:15:23 2017 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Tue Mar  7 15:15:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/virtualization.git/commit/?id=616fb064

firejail: bump

 sys-apps/firejail/firejail-9999.ebuild | 49 +++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
index 7c5c9cb..ba563c1 100644
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ b/sys-apps/firejail/firejail-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=6
 
 inherit git-r3
 
@@ -15,32 +14,44 @@ EGIT_REPO_URI="https://github.com/netblue30/${PN}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+bind +chroot +seccomp"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
+IUSE="apparmor +bind +chroot +file-transfer +network
+	network-restricted +seccomp +userns x11"
+
+DEPEND="
+	!sys-apps/firejail-lts
+	apparmor? ( sys-libs/libapparmor )
+"
+RDEPEND="
+	${DEPEND}
+	x11? ( x11-wm/xpra[client,server] )
+"
 
 src_prepare() {
-	local -a EXTRA_ECONF;
-	sed \
-		-e '/\tstrip/d' \
-		-i Makefile.in
+	default
 	sed \
 		-e 's#/usr/bin/zsh#/bin/zsh#g' \
 		-i \
 			src/man/${PN}.txt \
 			src/${PN}/usage.c \
-			src/${PN}/sandbox.c \
 			src/${PN}/main.c
+	find -name Makefile.in -exec sed -i -r \
+		-e '/^\tinstall .*COPYING /d' \
+		-e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+		-e '1iCC=@CC@' {} + || die
 }
 
 src_configure() {
-	for flag in ${IUSE}; do
-		EXTRA_ECONF+=( $(use_enable "${flag/+}") )
-	done
-	EXTRA_ECONF="${EXTRA_ECONF[@]}"
-	default
+	local myeconfargs=(
+		$(use_enable apparmor)
+		$(use_enable bind)
+		$(use_enable chroot)
+		$(use_enable file-transfer)
+		$(use_enable network)
+		$(use_enable seccomp)
+		$(use_enable userns)
+		$(use_enable x11)
+	)
+	use network-restricted && myeconfargs+=( --enable-network=restricted )
+	econf "${myeconfargs[@]}"
 }