gentoo resync : 25.11.2020

7 files changed, 240 insertions, 189 deletions

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 071d8d8b124c..a4f6d2c1615f 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,5 +1,5 @@
-DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319 SHA512 dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f
-EBUILD firejail-0.9.62-r1.ebuild 2102 BLAKE2B d30a3fa1db880a665b7f3754b14046d3e82e6a53fe9aa059dbfe6dfe48d97ece348efec04c94bba3f13961663bd39686a863039cd03a1ee2789a16511db3fe9d SHA512 6b6657dedcfea70e330e9240e0ee66c6658635bae9e10f58e07e0aa428803b8c4ece403f6530defca9782c2fe83972c223c9d1b7287445e6e88427e02884c679
-EBUILD firejail-0.9.62.ebuild 2162 BLAKE2B fbeced554b46369107e56846ebb4d8b4accd3c81996f81222a145a4d054ff1426f3514c59c4558c2f517cbc7a1f5035005c10fe778f152fa56a51c752eaaa40d SHA512 449e60bf793afa228f106e3b8913e8d7ba24e31f6e09da141750d0e607b91cd4dcdfa0092c88dcc16e593907182ada3fe20491df850e09cc95895ec1cb75a6c3
-EBUILD firejail-9999.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a
-MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e
+DIST firejail-0.9.64.tar.xz 419464 BLAKE2B 9425910bd78739dc628a05247877f3e96065f9eab6be1fa87a70932ff04a53817e03cd67a81b35b0e5a69b5598fc5be9d6191f9c5c2bf511bc76c1edaf0eb22d SHA512 89bab9aee944ebde6221a96f0f028380f607cd49046cad5348d5974efcc92c50a172edf5e50c56606091d2060d1d8f0c50a41f05f63327672a3c3cb48eb93699
+EBUILD firejail-0.9.64-r1.ebuild 2482 BLAKE2B 3703d9d5ce29d3731c78d676a16ec3f2783be1e9a279d5097b91cde0bddfa947534f6daeb0de1248c1fad260a3b2d490866b9a62ae9ff7959f79fb82ab2f367c SHA512 99fcad32da86fbf263813f41a756027577875fd5a5836ec8211c4232aa1047d2408493410c05513aa4bbd15997fb5490d2be4f3132b5985d17042ff216ba0d54
+EBUILD firejail-0.9.64.ebuild 2280 BLAKE2B 2c8f17dab51ab876796b249dec5ac848cc22606d9d5ffa806a6fdf2f1a041a2b9c33b5e41fbce69315574a5304c077f45e0b33b2fe73186806f3198a8d200a9b SHA512 30c053e6779f15d97e9a7dbb2377429e0a4b3bcc25491f647d1b66076f50f76b7cc79cebc09da8fbaa8b5454867d00153c7eceb6eaa828666ef702d2dd7104f7
+EBUILD firejail-9999.ebuild 2283 BLAKE2B a7b65c61e0954035bcbadc74fdb2e81882114f2b163b4a3c45a73017224684fb4a8ae8bbf6cd2deb3d6676a6edfe2c7797178fe992a86f4372ed56bc51b06ecc SHA512 c97f99ede18629d656520e45c4767bd76c5e4432352002e000eb78675ea28f2d8733eebd8e61f0032597f574270acbf83c176d0b982bc8ad5451ff46bb1598e2
+MISC metadata.xml 1832 BLAKE2B aec785bbd3674d6ec089390d65c064b6ce1f56c9ae459f39808a393dd478b9225821dbaad8892f22f367d5c163f40b664b29afcd130aa6463a87fe6c46ef592f SHA512 c1f8ee756c4bd7e79cfa81b4c5ac92a3377ab58a5d8df6f5535d9906d3fcb55d9f34664f2206c950b3b8ba560e3ed7e4d18b7f5637463ac8cb1934a90b2b68d4
diff --git a/sys-apps/firejail/firejail-0.9.62-r1.ebuild b/sys-apps/firejail/firejail-0.9.62-r1.ebuild
deleted file mode 100644
index 0521f812dbf4..000000000000
--- a/sys-apps/firejail/firejail-0.9.62-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="apparmor? ( sys-libs/libapparmor )"
-
-DEPEND="${RDEPEND}
-	!sys-apps/firejail-lts
-	test? ( dev-tcltk/expect )"
-
-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 -i -r \
-			-e '/^\tinstall .*COPYING /d' \
-			-e '/CFLAGS/s: (-O2|-ggdb) : :g' || die
-
-	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-
-	# remove compression of man pages
-	sed -i -e '/gzip -9n $$man; \\/d' Makefile.in || die
-	sed -i -e '/rm -f $$man.gz; \\/d' Makefile.in || die
-	sed -i -r -e '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_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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-0.9.62.ebuild b/sys-apps/firejail/firejail-0.9.62.ebuild
deleted file mode 100644
index 1b6e14740a13..000000000000
--- a/sys-apps/firejail/firejail-0.9.62.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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-0.9.64-r1.ebuild b/sys-apps/firejail/firejail-0.9.64-r1.ebuild
new file mode 100644
index 000000000000..32dabff199ad
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.64-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit toolchain-funcs python-single-r1 linux-info
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
+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="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-apps/firejail-lts
+	apparmor? ( sys-libs/libapparmor )
+	contrib? ( ${PYTHON_DEPS} )
+	dbusproxy? ( sys-apps/xdg-dbus-proxy )"
+
+DEPEND="${RDEPEND}
+	sys-libs/libseccomp
+	test? ( dev-tcltk/expect )"
+
+REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
+
+	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+
+	# remove compression of man pages
+	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
+
+	if use contrib; then
+		python_fix_shebang -f contrib/*.py
+	fi
+
+	# some tests were missing from this release's tarball
+	if use test; then
+		sed -i -r -e 's/^(test:.*) test-private-lib (.*)/\1 \2/; s/^(test:.*) test-fnetfilter (.*)/\1 \2/' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-firetunnel \
+		$(use_enable apparmor) \
+		$(use_enable chroot) \
+		$(use_enable dbusproxy) \
+		$(use_enable file-transfer) \
+		$(use_enable globalcfg) \
+		$(use_enable network) \
+		$(use_enable overlayfs) \
+		$(use_enable private-home) \
+		$(use_enable suid) \
+		$(use_enable userns) \
+		$(use_enable whitelist) \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	if use contrib; then
+		python_scriptinto /usr/$(get_libdir)/firejail
+		python_doscript contrib/*.py
+		insinto /usr/$(get_libdir)/firejail
+		dobin contrib/*.sh
+	fi
+}
+
+pkg_postinst() {
+	CONFIG_CHECK="~SQUASHFS"
+	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
+	check_extra_config
+}
diff --git a/sys-apps/firejail/firejail-0.9.64.ebuild b/sys-apps/firejail/firejail-0.9.64.ebuild
new file mode 100644
index 000000000000..21d6c2b97361
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.64.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit toolchain-funcs python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~x86"
+	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
+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="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-apps/firejail-lts
+	apparmor? ( sys-libs/libapparmor )
+	contrib? ( ${PYTHON_DEPS} )
+	dbusproxy? ( sys-apps/xdg-dbus-proxy )"
+
+DEPEND="${RDEPEND}
+	sys-libs/libseccomp
+	test? ( dev-tcltk/expect )"
+
+REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+
+	find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
+
+	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+
+	# remove compression of man pages
+	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
+
+	if use contrib; then
+		python_fix_shebang -f contrib/*.py
+	fi
+
+	# some tests were missing from this release's tarball
+	if use test; then
+		sed -i -r -e 's/^(test:.*) test-private-lib (.*)/\1 \2/; s/^(test:.*) test-fnetfilter (.*)/\1 \2/' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-firetunnel \
+		$(use_enable apparmor) \
+		$(use_enable chroot) \
+		$(use_enable dbusproxy) \
+		$(use_enable file-transfer) \
+		$(use_enable globalcfg) \
+		$(use_enable network) \
+		$(use_enable overlayfs) \
+		$(use_enable private-home) \
+		$(use_enable suid) \
+		$(use_enable userns) \
+		$(use_enable whitelist) \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	if use contrib; then
+		python_scriptinto /usr/$(get_libdir)/firejail
+		python_doscript contrib/*.py
+		insinto /usr/$(get_libdir)/firejail
+		dobin contrib/*.sh
+	fi
+}
diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
index 8dfef8571888..5858a542c311 100644
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ b/sys-apps/firejail/firejail-9999.ebuild
@@ -3,9 +3,13 @@
 
 EAPI=7
 
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit toolchain-funcs python-single-r1 linux-info
+
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
@@ -17,32 +21,37 @@ 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"
+IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist"
+RESTRICT="!test? ( test )"
 
-DEPEND="!sys-apps/firejail-lts
+RDEPEND="!sys-apps/firejail-lts
 	apparmor? ( sys-libs/libapparmor )
+	contrib? ( ${PYTHON_DEPS} )
+	dbusproxy? ( sys-apps/xdg-dbus-proxy )"
+
+DEPEND="${RDEPEND}
+	sys-libs/libseccomp
 	test? ( dev-tcltk/expect )"
 
-RDEPEND="apparmor? ( sys-libs/libapparmor )"
+REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
 
-# TODO: enable tests
-RESTRICT="test"
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
 
 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
+	find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
 
-	sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+	sed -i -r -e '/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
+	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
+
+	if use contrib; then
+		python_fix_shebang -f contrib/*.py
+	fi
 }
 
 src_configure() {
@@ -50,27 +59,35 @@ src_configure() {
 		--disable-firetunnel \
 		$(use_enable apparmor) \
 		$(use_enable chroot) \
-		$(use_enable contrib contrib-install) \
+		$(use_enable dbusproxy) \
 		$(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)
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
 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
+	if use contrib; then
+		python_scriptinto /usr/$(get_libdir)/firejail
+		python_doscript contrib/*.py
+		insinto /usr/$(get_libdir)/firejail
+		dobin contrib/*.sh
 	fi
 }
+
+pkg_postinst() {
+	CONFIG_CHECK="~SQUASHFS"
+	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
+	check_extra_config
+}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 07938ac97ea4..a41213b778f7 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>expeditioneer@gentoo.org</email>
-		<name>Dennis Lamm</name>
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		Firejail is a SUID program that reduces the risk of security breaches by restricting the running environment of
@@ -21,14 +25,14 @@
 		<flag name="apparmor">Enable support for custom AppArmor profiles</flag>
 		<flag name="chroot">Enable chrooting to custom directory</flag>
 		<flag name="contrib">Install contrib scripts</flag>
+		<flag name="dbusproxy">Enable DBus proxying to filter access in supporting profiles</flag>
 		<flag name="file-transfer">Enable file transfers between sandboxes and the host system</flag>
 		<flag name="globalcfg">Enable global config file</flag>
 		<flag name="network">Enable networking features</flag>
 		<flag name="overlayfs">Enable overlayfs</flag>
 		<flag name="private-home">Enable private home feature</flag>
-		<flag name="seccomp">Enable system call filtering</flag>
 		<flag name="userns">Enable attaching a new user namespace to a sandbox (--noroot option)</flag>
 		<flag name="whitelist">Enable whitelist</flag>
-		<flag name="x11">Enable X11 sandboxing</flag>
+		<flag name="X">Enable X11 sandboxing</flag>
 	</use>
 </pkgmetadata>