Merge updates from master

16 files changed, 150 insertions, 416 deletions

diff --git a/net-im/ejabberd/ejabberd-17.01-r2.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
index 2d05543a5718..d20acca57feb 100644
--- a/net-im/ejabberd/ejabberd-17.01-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
@@ -41,6 +41,7 @@ CDEPEND="
 	>=dev-erlang/stringprep-1.0.7
 	>=dev-erlang/stun-1.0.9
 	>=dev-erlang/xmpp-1.1.6
+	<dev-erlang/xmpp-1.2.0
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
 	!>=dev-lang/erlang-20.0
 	>=net-im/jabber-base-0.01
diff --git a/net-im/ejabberd/ejabberd-17.04-r1.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
index 49ecf5359e3a..02947b6b7391 100644
--- a/net-im/ejabberd/ejabberd-17.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
@@ -41,6 +41,7 @@ CDEPEND="
 	>=dev-erlang/stringprep-1.0.8
 	>=dev-erlang/stun-1.0.10
 	>=dev-erlang/xmpp-1.1.9
+	<dev-erlang/xmpp-1.2.0
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
 	!>=dev-lang/erlang-20.0
 	>=net-im/jabber-base-0.01
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
index 1c5c02166647..6a2041af6c58 100644
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -41,6 +41,7 @@ CDEPEND="
 	>=dev-erlang/stringprep-1.0.8
 	>=dev-erlang/stun-1.0.10
 	>=dev-erlang/xmpp-1.1.9
+	<dev-erlang/xmpp-1.2.0
 	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
 	>=net-im/jabber-base-0.01
 	ldap? ( =net-nds/openldap-2* )
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index cae261b2c876..4d0f6deef322 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1 +1,2 @@
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
+DIST armadillo-9.200.5.tar.xz 4786264 BLAKE2B 3ac5e7e50c82927ba311860915d65426e5b71e6235a041b949166e02aa50dd50a6c32d34d44761052829471ce66df9a4a9a495e1da18deff2abfbd8d67b72d0f SHA512 31110ac0d9ef9e6cf6fcf97a846ad4bb7545aa2d16fc847d85d481d605942af62994562ba8b083d76b051002d6693c966ee4b4ad398711fe1d68d31bf12daea2
diff --git a/sci-libs/armadillo/armadillo-9.200.5.ebuild b/sci-libs/armadillo/armadillo-9.200.5.ebuild
new file mode 100644
index 000000000000..9cd79ff39d6c
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-9.200.5.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
+REQUIRED_USE="test? ( lapack )"
+
+#	atlas? ( sci-libs/atlas[lapack] )
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( >=sci-libs/superlu-5.2 )
+"
+
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+
+src_prepare() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DARMA_EXTRA_DEBUG="$(usex debug)"
+		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
+		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	else
+		mycmakeargs+=(
+			-DARPACK_FOUND=OFF
+		)
+	fi
+#	if use atlas; then
+#		local c=atlas-cblas l=atlas-clapack
+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+#		mycmakeargs+=(
+#			-DCBLAS_FOUND=ON
+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+#			-DCLAPACK_FOUND=ON
+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+#		)
+#	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	else
+		mycmakeargs+=(
+			-DBLAS_FOUND=OFF
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DHDF5_FOUND=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+		)
+	else
+		mycmakeargs+=(
+			-DHDF5_FOUND=OFF
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	else
+		mycmakeargs+=(
+			-DLAPACK_FOUND=OFF
+		)
+	fi
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
+		)
+	else
+		mycmakeargs+=(
+			-DSuperLU_FOUND=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.md
+	use doc && dodoc *pdf *html
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 02cfdd6b8775..6f30a7cf3054 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,8 +1,2 @@
-DIST firejail-0.9.44.10.tar.xz 216216 BLAKE2B 15e0a9b2dec55639006efc39271dc5317fc06c9a764109e4d11df37d564eee9d017d9cf83ebb16adf39a6229e3119072137a4256906366c5e52f7ad7b429c2b7 SHA512 d9d259c25964eeea87311353a4488e56d1bd65c024aa79f5f2493100f58de4904e081db42132e8d190a05a105fb51dba1d0ac174bf786dc3ec43f356380b3fa6
-DIST firejail-0.9.44.8.tar.xz 214624 BLAKE2B 05faddb65ea1736ff0a098f5ac8ae8bec62a74aa4e7cbaf1acc2d3c9b549c322a141ab424f73272ad2517817bfff053c798ca8acdfa4e11b1b0829bbdbda162a SHA512 5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f
-DIST firejail-0.9.46.tar.xz 254748 BLAKE2B bf9c6af2bbc53c153d39c16b4d1720f61110e40b5b7a57fd1f4edc4d758d7edb3cbfde17dbc1865ab1d3ad7cfc58e28d0e4d6aab1109bcdf9a4fb0179d1f5c98 SHA512 839f3d6146129ceb9e9a613a51ce76d1d0a8a9ccab85c807bb0e71354b5c25fbc2a76e1004400bba8b70434dd886bc67250a2fe0b0eaa7d1ee65f6472bc9f786
-DIST firejail-0.9.48.tar.xz 257592 BLAKE2B 6e346f97417ceb2fbd31779715b652130466dc007be6ebdca7f1d7c46a784b9f6a938370fc6abf50d131e1959001ffcbf9b98dc9968647339677a101b1d974ea SHA512 63d2d8a6e6b3f505c88b132a3528ec5211ca5325e53ad1878b25bfb7d679b63af769443b464375a96ea5278b0edca98bd295256072dfa2e1a9d3ba829579b0b7
 DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d
-DIST firejail-0.9.52.tar.xz 299396 BLAKE2B 62b7798e46b69f1ae12ac85f219cc7414652e64d3bf9e1b206f8956febdc53c78151f08052fe694c691b787356b6821e8ff0df71a4277a238a4dc7d724165969 SHA512 f7318bcbd68f6d8c709cdc1f5065cb1019c1c64fdbd47c0fd698975412c4e075c7209bd275056daf61558b79d79127c88f1580cb8e4e034cc0551c7d34e11d06
-DIST firejail-0.9.54.tar.xz 315884 BLAKE2B 62eaf42711aa3560c7ecb965903b64b10e04ea2898950b13c5371d859ccb1633634e1455c5558bf6fc02211d9937270fbc82cdd8409ff060f3a2c5aa8eb51517 SHA512 84bb5992ea4846d4398cc72dd9d65a8c4f20da9a2798ccd74a9157088313b768ef361bada62617d02b31174bca4b95e6560140f448021e1b93740a37992fe3df
 DIST firejail-0.9.56.tar.xz 327336 BLAKE2B 4fe2276c3007e995ca2113ef870918287e1178ff0effdcd5d635fce6d170b6c3df2f75b45315fed1e58e1c993324b84091f7e6912493608233f96661c85ce7e2 SHA512 f9685be0cbfdf45f8f895041c63e005da483d9b09482ebda2776633ae0b048cd355b57bf4431348295507059633dfda45b0c8b2c1f4a83ad02ff661d32448d24
diff --git a/sys-apps/firejail/files/0.9.46-contrib-fix.patch b/sys-apps/firejail/files/0.9.46-contrib-fix.patch
deleted file mode 100644
index fc882b4dc6e6..000000000000
--- a/sys-apps/firejail/files/0.9.46-contrib-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur firejail-0.9.46/contrib/fix_private-bin.py firejail-0.9.46.new/contrib/fix_private-bin.py
---- firejail-0.9.46/contrib/fix_private-bin.py	2017-05-13 14:44:54.000000000 +0100
-+++ firejail-0.9.46.new/contrib/fix_private-bin.py	2017-05-29 15:25:56.355489307 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- __author__ = "KOLANICH"
- __copyright__ = """This is free and unencumbered software released into the public domain.
-diff -Naur firejail-0.9.46/contrib/fjclip.py firejail-0.9.46.new/contrib/fjclip.py
---- firejail-0.9.46/contrib/fjclip.py	2017-05-13 14:44:54.000000000 +0100
-+++ firejail-0.9.46.new/contrib/fjclip.py	2017-05-29 15:25:39.463236203 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-@@ -32,4 +32,4 @@
- else:
-     display = fjdisplay.getdisplay(sys.argv[2])
-     clipout = subprocess.Popen(['xsel','-b','-i','--display',display],stdin=subprocess.PIPE)
--    clipout.communicate(clipin)
-\ Brak znaku nowej linii na końcu pliku
-+    clipout.communicate(clipin)
-diff -Naur firejail-0.9.46/contrib/fjdisplay.py firejail-0.9.46.new/contrib/fjdisplay.py
---- firejail-0.9.46/contrib/fjdisplay.py	2017-05-13 14:44:54.000000000 +0100
-+++ firejail-0.9.46.new/contrib/fjdisplay.py	2017-05-29 15:25:47.191351983 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-@@ -40,4 +40,4 @@
-     if len(sys.argv) == 1:
-         print(getfirejails())
-     if len(sys.argv) == 2:
--        print (getdisplay(sys.argv[1]))
-\ Brak znaku nowej linii na końcu pliku
-+        print (getdisplay(sys.argv[1]))
-diff -Naur firejail-0.9.46/contrib/fjresize.py firejail-0.9.46.new/contrib/fjresize.py
---- firejail-0.9.46/contrib/fjresize.py	2017-05-13 14:44:54.000000000 +0100
-+++ firejail-0.9.46.new/contrib/fjresize.py	2017-05-29 15:26:03.728599816 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- import fjdisplay
-@@ -22,4 +22,4 @@
-     out = subprocess.check_output(['xrandr','--display',fjdisplay.getdisplay(sys.argv[1]),'--output','default','--mode',sys.argv[2]])
-     print(out)
- else:
--    print(usage)
-\ Brak znaku nowej linii na końcu pliku
-+    print(usage)
diff --git a/sys-apps/firejail/files/0.9.48-contrib-fix.patch b/sys-apps/firejail/files/0.9.48-contrib-fix.patch
deleted file mode 100644
index 7192bba34807..000000000000
--- a/sys-apps/firejail/files/0.9.48-contrib-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
---- firejail-0.9.48/contrib/fix_private-bin.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fix_private-bin.py	2017-08-27 23:19:52.868481040 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- __author__ = "KOLANICH"
- __copyright__ = """This is free and unencumbered software released into the public domain.
-diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
---- firejail-0.9.48/contrib/fjclip.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjclip.py	2017-08-27 23:19:58.476562539 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
---- firejail-0.9.48/contrib/fjdisplay.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjdisplay.py	2017-08-27 23:20:01.932612762 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
---- firejail-0.9.48/contrib/fjresize.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjresize.py	2017-08-27 23:20:06.932685422 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- import fjdisplay
diff --git a/sys-apps/firejail/files/0.9.52-contrib-fix.patch b/sys-apps/firejail/files/0.9.52-contrib-fix.patch
deleted file mode 100644
index 7192bba34807..000000000000
--- a/sys-apps/firejail/files/0.9.52-contrib-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
---- firejail-0.9.48/contrib/fix_private-bin.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fix_private-bin.py	2017-08-27 23:19:52.868481040 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- __author__ = "KOLANICH"
- __copyright__ = """This is free and unencumbered software released into the public domain.
-diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
---- firejail-0.9.48/contrib/fjclip.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjclip.py	2017-08-27 23:19:58.476562539 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
---- firejail-0.9.48/contrib/fjdisplay.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjdisplay.py	2017-08-27 23:20:01.932612762 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
---- firejail-0.9.48/contrib/fjresize.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjresize.py	2017-08-27 23:20:06.932685422 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- import fjdisplay
diff --git a/sys-apps/firejail/files/0.9.54-contrib-fix.patch b/sys-apps/firejail/files/0.9.54-contrib-fix.patch
deleted file mode 100644
index 7192bba34807..000000000000
--- a/sys-apps/firejail/files/0.9.54-contrib-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
---- firejail-0.9.48/contrib/fix_private-bin.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fix_private-bin.py	2017-08-27 23:19:52.868481040 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- __author__ = "KOLANICH"
- __copyright__ = """This is free and unencumbered software released into the public domain.
-diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
---- firejail-0.9.48/contrib/fjclip.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjclip.py	2017-08-27 23:19:58.476562539 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
---- firejail-0.9.48/contrib/fjdisplay.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjdisplay.py	2017-08-27 23:20:01.932612762 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
---- firejail-0.9.48/contrib/fjresize.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjresize.py	2017-08-27 23:20:06.932685422 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- import fjdisplay
diff --git a/sys-apps/firejail/firejail-0.9.44.10.ebuild b/sys-apps/firejail/firejail-0.9.44.10.ebuild
deleted file mode 100644
index c2922823f2dd..000000000000
--- a/sys-apps/firejail/firejail-0.9.44.10.ebuild
+++ /dev/null
@@ -1,46 +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 +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] )"
-
-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 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/firejail-0.9.44.8.ebuild b/sys-apps/firejail/firejail-0.9.44.8.ebuild
deleted file mode 100644
index a3984c109f7c..000000000000
--- a/sys-apps/firejail/firejail-0.9.44.8.ebuild
+++ /dev/null
@@ -1,46 +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 +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] )"
-
-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 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/firejail-0.9.46.ebuild b/sys-apps/firejail/firejail-0.9.46.ebuild
deleted file mode 100644
index b53f0cfbfdc2..000000000000
--- a/sys-apps/firejail/firejail-0.9.46.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/firejail-0.9.48.ebuild b/sys-apps/firejail/firejail-0.9.48.ebuild
deleted file mode 100644
index b53f0cfbfdc2..000000000000
--- a/sys-apps/firejail/firejail-0.9.48.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/firejail-0.9.52.ebuild b/sys-apps/firejail/firejail-0.9.52.ebuild
deleted file mode 100644
index ac978533eb6f..000000000000
--- a/sys-apps/firejail/firejail-0.9.52.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 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/firejail-0.9.54.ebuild b/sys-apps/firejail/firejail-0.9.56-r1.ebuild
index 0a32135c4611..6da35dbc147b 100644
--- a/sys-apps/firejail/firejail-0.9.54.ebuild
+++ b/sys-apps/firejail/firejail-0.9.56-r1.ebuild
@@ -12,13 +12,12 @@ 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 suid +userns x11"
+IUSE="apparmor +chroot contrib +file-transfer +network
+	+seccomp suid +userns x11"
 
 DEPEND="!sys-apps/firejail-lts
 	apparmor? ( sys-libs/libapparmor )"
-RDEPEND="${DEPEND}
-	x11? ( x11-wm/xpra[client,server] )"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" )
 
@@ -35,7 +34,6 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_enable apparmor)
-		$(use_enable bind)
 		$(use_enable chroot)
 		$(use_enable contrib contrib-install)
 		$(use_enable file-transfer)
@@ -45,6 +43,5 @@ src_configure() {
 		$(use_enable userns)
 		$(use_enable x11)
 	)
-	use network-restricted && myeconfargs+=( --enable-network=restricted )
 	econf "${myeconfargs[@]}"
 }