gentoo resync : 15.01.2020

3 files changed, 81 insertions, 2 deletions

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 74531eb9d473..036b696cc14b 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,6 +1,8 @@
 AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230
 DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
+DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319 SHA512 dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f
 EBUILD firejail-0.9.60-r1.ebuild 1739 BLAKE2B 42e3ab59089ac04bd56768985de0ecdff1a1c4aa81a5bafc98409b0d15c3f1a85676d28149da9acff3c0df416327cff3f3cf2396ce036fd3f03809236c482593 SHA512 7c24163c7742575152ba862fd5cb0e33144fc7072bc914c9f102fffb4b939078ce6193f0de626d38da0dbd0ae306fd251038f3e762058e0064af2b6936c58977
-EBUILD firejail-9999.ebuild 2138 BLAKE2B 5f5134f7714330077f997a1d2714204dff80c4f41ed204ebc6d0e84c728e2d55b292b0bbad79903d01725492b4d9a45454948a8b9967379e694f82e49712ec1b SHA512 74426f3056a37ef9e9f8d430deafc9af15ba6957fef58cf0e43fdb9edf4321971ef92136c8261e528d53efba9602e304bf72c7096d65ba872808db0fe8e6d9c3
+EBUILD firejail-0.9.62.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a
+EBUILD firejail-9999.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a
 MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e
diff --git a/sys-apps/firejail/firejail-0.9.62.ebuild b/sys-apps/firejail/firejail-0.9.62.ebuild
new file mode 100644
index 000000000000..8dfef8571888
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.62.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
+	EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11"
+
+DEPEND="!sys-apps/firejail-lts
+	apparmor? ( sys-libs/libapparmor )
+	test? ( dev-tcltk/expect )"
+
+RDEPEND="apparmor? ( sys-libs/libapparmor )"
+
+# TODO: enable tests
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die
+
+	find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \
+			--expression='/^\tinstall .*COPYING /d' \
+			--expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die
+
+	sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+
+	# remove compression of man pages
+	sed --in-place '/gzip -9n $$man; \\/d' Makefile.in || die
+	sed --in-place '/rm -f $$man.gz; \\/d' Makefile.in || die
+	sed --in-place --regexp-extended 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-firetunnel \
+		$(use_enable apparmor) \
+		$(use_enable chroot) \
+		$(use_enable contrib contrib-install) \
+		$(use_enable file-transfer) \
+		$(use_enable globalcfg) \
+		$(use_enable network) \
+		$(use_enable overlayfs) \
+		$(use_enable private-home) \
+		$(use_enable seccomp) \
+		$(use_enable suid) \
+		$(use_enable userns) \
+		$(use_enable whitelist) \
+		$(use_enable x11)
+}
+
+src_install() {
+	default
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins contrib/vim/ftdetect/firejail.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/vim/syntax/firejail.vim
+	fi
+}
diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
index f47575ac444f..8dfef8571888 100644
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ b/sys-apps/firejail/firejail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-firetunnel \
 		$(use_enable apparmor) \
 		$(use_enable chroot) \
 		$(use_enable contrib contrib-install) \