gentoo resync : 10.11.2019

3 files changed, 2 insertions, 55 deletions

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index d66aabbfefe0..74531eb9d473 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,8 +1,6 @@
 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.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d
 DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
-EBUILD firejail-0.9.50.ebuild 1171 BLAKE2B 5b36b05b69a2936a8a94e56950fed464abc9719960305adbab0a228baedd930492ffca5cba4097db8ca68ca4371db74eaebbf702dd136876941c9a4556cbf0fc SHA512 639bebf94119505b10629c481c5db8df7eff476d84afe9795f4b9b9d56bb720c9e2a2507e9c50fa8156156badbe5ccfddc1d5f6f15b6b16591a594a4eea4b0df
 EBUILD firejail-0.9.60-r1.ebuild 1739 BLAKE2B 42e3ab59089ac04bd56768985de0ecdff1a1c4aa81a5bafc98409b0d15c3f1a85676d28149da9acff3c0df416327cff3f3cf2396ce036fd3f03809236c482593 SHA512 7c24163c7742575152ba862fd5cb0e33144fc7072bc914c9f102fffb4b939078ce6193f0de626d38da0dbd0ae306fd251038f3e762058e0064af2b6936c58977
 EBUILD firejail-9999.ebuild 2138 BLAKE2B 5f5134f7714330077f997a1d2714204dff80c4f41ed204ebc6d0e84c728e2d55b292b0bbad79903d01725492b4d9a45454948a8b9967379e694f82e49712ec1b SHA512 74426f3056a37ef9e9f8d430deafc9af15ba6957fef58cf0e43fdb9edf4321971ef92136c8261e528d53efba9602e304bf72c7096d65ba872808db0fe8e6d9c3
-MISC metadata.xml 1839 BLAKE2B 89a65b4a6f02a94778bee8b4fadb9b54cfb1220407f5fb256e7b0bb0a439a10069d7c84470be6a12ad478413eb2563b5f18f8cea0c60a11fb6582c94f991c06f SHA512 539f6f95e5df4bd194a473e140205414620dfa47d0be1e51a3557b04f3185b8471d6f378b9dc661c41f1cb04962810b1276f79477377f8f0880171a2b0f47b9b
+MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e
diff --git a/sys-apps/firejail/firejail-0.9.50.ebuild b/sys-apps/firejail/firejail-0.9.50.ebuild
deleted file mode 100644
index 85b81b1bd4d5..000000000000
--- a/sys-apps/firejail/firejail-0.9.50.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="apparmor +bind +chroot contrib +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] )"
-
-PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
-
-RESTRICT=test
-
-src_prepare() {
-	default
-	find -name Makefile.in -exec sed -i -r \
-			-e '/^\tinstall .*COPYING /d' \
-			-e '/CFLAGS/s: (-O2|-ggdb) : :g' \
-			-e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable apparmor)
-		$(use_enable bind)
-		$(use_enable chroot)
-		$(use_enable contrib contrib-install)
-		$(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[@]}"
-}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 3af2a06d7a1d..07938ac97ea4 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -14,18 +14,16 @@
 		This is the regular version. For a long term support version see sys-apps/firejail-lts.
 	</longdescription>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:firejail_project:firejail</remote-id>
 		<remote-id type="github">netblue30/firejail</remote-id>
 	</upstream>
 	<use>
 		<flag name="apparmor">Enable support for custom AppArmor profiles</flag>
-		<flag name="bind">Enable custom bind mounts</flag>
 		<flag name="chroot">Enable chrooting to custom directory</flag>
 		<flag name="contrib">Install contrib scripts</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="network-restricted">Grant access to --interface, --net=ethXXX and --netfilter only to root user;
-										regular users are	only allowed --net=none</flag>
 		<flag name="overlayfs">Enable overlayfs</flag>
 		<flag name="private-home">Enable private home feature</flag>
 		<flag name="seccomp">Enable system call filtering</flag>