Sync with portage [Wed Jan 11 23:51:36 MSK 2017].

7 years ago · d4522f489f
parent 8043c5635b
commit d4522f489f
21 changed files with 240 additions and 26 deletions
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@ -1,2 +1,3 @@
 DIST pcre-8.38.tar.bz2 1562265 SHA256 b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df SHA512 ad3412ceee8f992787a3e7cbe0155ffba67affd4b2dfece6c4501dc8d2012f52dcc1ee1f56759362e04bbbd10ea9370b3e46f238e2f75005cb69f6c8439e52c0 WHIRLPOOL 68533f741a3faa618f4d7341bfa59aaac295ac6af6085772e4c169ad73fae38e98cace2ce2af2899a619bb05dce79859dcd175a158a73729082f7cf52107d1df
 DIST pcre-8.39.tar.bz2 1560758 SHA256 b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b SHA512 8b0f14ae5947c4b2d74876a795b04e532fd71c2479a64dbe0ed817e7c7894ea3cae533413de8c17322d305cb7f4e275d72b43e4e828eaca77dc4bcaf04529cf6 WHIRLPOOL 00e8e7fb3dc60cbbd2ee185e269696058b568a0f269749386bad44cb474f723c9ed3dfd2af91ddce0b5047aab459864f07e05940af17d3d51d2f1b068415b1ed
+DIST pcre-8.40.tar.bz2 1560119 SHA256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 WHIRLPOOL 6711688972b3db4b98902d548b84e8b03b61c3a12d24a4e42fc49ddc5e2b4be51f98f91873166e550866e88b6cd55092ea27704a3b7e71d58a2af21148ad3340
--- a/dev-libs/libpcre/libpcre-8.40.ebuild
+++ b/dev-libs/libpcre/libpcre-8.40.ebuild
@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+	libedit? ( !readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre-config
+)
+
+#PATCHES=(
+#)
+
+src_prepare() {
+	#epatch "${PATCHES[@]}"
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
+		$(multilib_native_use_enable bzip2 pcregrep-libbz2) \
+		$(use_enable cxx cpp) \
+		$(use_enable jit) $(use_enable jit pcregrep-jit) \
+		$(use_enable pcre16) \
+		$(use_enable pcre32) \
+		$(multilib_native_use_enable libedit pcretest-libedit) \
+		$(multilib_native_use_enable readline pcretest-libreadline) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
+		$(multilib_native_use_enable zlib pcregrep-libz) \
+		--enable-pcre8 \
+		--enable-shared \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	gen_usr_ldscript -a pcre
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}
--- a/dev-python/locket/locket-0.2.0.ebuild
+++ b/dev-python/locket/locket-0.2.0.ebuild
@ -19,4 +19,4 @@ IUSE=""

 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}"]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@ -1 +1,2 @@
 DIST zeep-0.22.0.tar.gz 87637 SHA256 f561e010a86678341cee45b0f7e03284bf3b2b60c25ac8bcfc600488a507ad3c SHA512 42fb3ca2d8e459b48ebafa77d31642b08c02d931b9cac75b6697917439b7ad7eba5e9ec91b769f3c21dfc972557243ffd48da49234d649903dc0da440bef4b88 WHIRLPOOL c2c528fceb5008d2be3dbcf7b1967e6dab3d3ba49ad5265826508edc5742d03b773c0d2cb38e33aa07ca66162ceced686be17fc6e842f2b599084dd7eec7adaf
+DIST zeep-0.24.0.tar.gz 108457 SHA256 cac3a7921c52bc5eda5aba988e0ac2c16fae15991d0af1ff97289e4bcfe0df2d SHA512 51376ee9a37553cdeecd67db38cb6f85d17d3e1c35396eec0c174b21805e4fa7752355f748e89af4df50b922c84c3647e986662ab64045bbd2d63ef53c918f2a WHIRLPOOL 4da78d4d0e917165f450f3f0d7abbb1580710509cd8d0583496cc25ed24df17c699b40e8c801de07f0d58c69dca34ab99dd8eaa71f12b43bf886e818a4bd4987
--- a/dev-python/zeep/zeep-0.24.0.ebuild
+++ b/dev-python/zeep/zeep-0.24.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+inherit distutils-r1
+
+DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
+HOMEPAGE="http://docs.python-zeep.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+RDEPEND="${DEPEND}
+	>=dev-python/appdirs-1.4.0
+	>=dev-python/cached-property-1.0.0
+	>=dev-python/defusedxml-0.4.1
+	>=dev-python/isodate-0.5.4
+	>=dev-python/lxml-3.0.0
+	>=dev-python/requests-2.7.0
+	>=dev-python/six-1.9.0
+	dev-python/pytz"
+
+DOCS=( README.rst CHANGES )
--- a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
+++ b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch
@ -18,12 +18,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps.
 -		       [have_libxml=yes
 -		       AC_DEFINE(HAVE_LIBXML)],
 -		       [have_libxml=no])
-+if test "${enable_xml}" = "yes"; then
+AS_IF([test "${enable_xml}" = "yes"], [
 +	PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7],
 +			       [have_libxml=yes
 +			       AC_DEFINE(HAVE_LIBXML)],
 +			       [AC_MSG_ERROR([libxml2 not found])])
-+fi
+])
 AM_CONDITIONAL(HAVE_LIBXML, test "x$have_libxml" = xyes)
 
 +AC_ARG_ENABLE([json],
@ -36,12 +36,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps.
 -		       [have_jansson=yes
 -		       AC_DEFINE(HAVE_JANSSON)],
 -		       [have_jansson=no])
-+if test "${enable_json}" = "yes"; then
+AS_IF([test "${enable_json}" = "yes"], [
 +	PKG_CHECK_MODULES(JANSSON, jansson,
 +			       [have_jansson=yes
 +			       AC_DEFINE(HAVE_JANSSON)],
 +			       [AC_MSG_ERROR([jansson not found])])
-+fi
+])
 AM_CONDITIONAL(HAVE_JANSSON, test "x$have_jansson" = xyes)
 
 +AC_ARG_ENABLE([yaml],
@ -54,12 +54,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps.
 -		       [have_libyaml=yes
 -		       AC_DEFINE(HAVE_LIBYAML)],
 -		       [have_libyaml=no])
-+if test "${enable_yaml}" = "yes"; then
+AS_IF([test "${enable_yaml}" = "yes"], [ 
 +	PKG_CHECK_MODULES(LIBYAML, yaml-0.1,
 +			       [have_libyaml=yes
 +			       AC_DEFINE(HAVE_LIBYAML)],
 +			       [AC_MSG_ERROR([libyaml not found])])
-+fi
+])
 AM_CONDITIONAL(HAVE_LIBYAML, test "x$have_libyaml" = xyes)
 
 
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 18:13:25 +0000
+Wed, 11 Jan 2017 20:13:14 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 18:13:25 +0000
+Wed, 11 Jan 2017 20:13:14 +0000
--- a/metadata/md5-cache/dev-libs/libpcre-8.40
+++ b/metadata/md5-cache/dev-libs/libpcre-8.40
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig
+DESCRIPTION=Perl-compatible regular expression library
+EAPI=5
+HOMEPAGE=http://www.pcre.org/
+IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
+SLOT=3
+SRC_URI=mirror://sourceforge/pcre/pcre-8.40.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.40.tar.bz2
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=e24078c3bf31eeccaf5083daab081345
--- a/metadata/md5-cache/dev-python/locket-0.2.0
+++ b/metadata/md5-cache/dev-python/locket-0.2.0
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/l/locket/locket-0.2.0.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3a72489a55b53dccd11966956678215a
+_md5_=14c97e5474a11398ddc4e237e2663759
--- a/metadata/md5-cache/dev-python/zeep-0.24.0
+++ b/metadata/md5-cache/dev-python/zeep-0.24.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A modern/fast Python SOAP client based on lxml / requests
+EAPI=6
+HOMEPAGE=http://docs.python-zeep.org/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/setuptools >=dev-python/appdirs-1.4.0 >=dev-python/cached-property-1.0.0 >=dev-python/defusedxml-0.4.1 >=dev-python/isodate-0.5.4 >=dev-python/lxml-3.0.0 >=dev-python/requests-2.7.0 >=dev-python/six-1.9.0 dev-python/pytz python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/z/zeep/zeep-0.24.0.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=cc960af8e622c84cca11a89af81706d6
--- a/metadata/md5-cache/sys-apps/firejail-0.9.44.4
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.44.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor )
+DESCRIPTION=Security sandbox for any type of processes
+EAPI=6
+HOMEPAGE=https://firejail.wordpress.com/
+IUSE=apparmor +bind +chroot +file-transfer +network network-restricted +seccomp +userns x11
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) x11? ( x11-wm/xpra[client,server] )
+SLOT=0
+SRC_URI=mirror://sourceforge/firejail/firejail-0.9.44.4.tar.xz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=020a1e5acbbd1a8b55534456ae0e69ce
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 18:13:25 +0000
+Wed, 11 Jan 2017 20:13:14 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Jan 11 18:09:35 UTC 2017
+Wed Jan 11 20:09:24 UTC 2017
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 18:30:01 +0000
+Wed, 11 Jan 2017 20:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1484158201 Wed 11 Jan 2017 06:10:01 PM UTC
+1484165401 Wed 11 Jan 2017 08:10:01 PM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 18:13:25 +0000
+Wed, 11 Jan 2017 20:13:14 +0000
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@ -1 +1,2 @@
 DIST firejail-0.9.44.2.tar.xz 213092 SHA256 c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e WHIRLPOOL 365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf04231111575f972e52accc8d08f23b0f0e26141918f2978
+DIST firejail-0.9.44.4.tar.xz 213648 SHA256 2d70a2cd554835db0e2eba201c0466e247fbaa2b60c86abd34b9170e0eebc10f SHA512 222567db00fd85f468fff380dbc875b10fe4eb94ff95669e15adc4db55b36208eaef5ceb65bd2d05d79f8f9230552fb0f597fb6b7bf06bb47537321c9c02a3be WHIRLPOOL 8f19f2bda316cca29057d547d9deb357a55db3ffe3ef0ef02f948bd975e2e66f34a91f121363c15b5f6012fb3bde08fa10d2bc90233a14662406effbaff9fe37
--- a/sys-apps/firejail/files/firejail-0.9.44.4-sysmacros.patch
+++ b/sys-apps/firejail/files/firejail-0.9.44.4-sysmacros.patch
@ -0,0 +1,10 @@
+--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
+@@ -28,6 +28,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE 
+ #endif
+#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ typedef struct {
--- a/sys-apps/firejail/firejail-0.9.44.4.ebuild
+++ b/sys-apps/firejail/firejail-0.9.44.4.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+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] )"
+
+PATCHES=( "${FILESDIR}"/${P}-sysmacros.patch )
+
+src_prepare() {
+	default
+	find -name Makefile.in -exec sed -i -r \
+			-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[@]}"
+}
--- a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
@ -7,7 +7,6 @@ Subject: [PATCH] llvm-config: Clean up exported values, update for shared
 Gentoo-specific fixup for llvm-config, including:
 - wiping build-specific CFLAGS, CXXFLAGS,
 - updating library suffixes for shared libs,
- wiping --system-libs for shared linking,
 - making --src-root return invalid path (/dev/null),
 - making --build-mode return "Release" rather than "Gentoo".

@ -39,16 +38,6 @@ index 744fa4e44d1..593788aaef3 100644
 set(LLVM_BUILD_SYSTEM cmake)
 set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
 set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
-@@ -46,7 +50,8 @@ endif()
- # Use the C++ link flags, since they should be a superset of C link flags.
- set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
- set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
-set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
-+# We don't do static libs, so we don't need to supply any system-libs
-+set(LLVM_SYSTEM_LIBS "")
- if(BUILD_SHARED_LIBS)
-   set(LLVM_ENABLE_SHARED ON)
- else()
 diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
 index d780094861c..c61c72ff48c 100644
 --- a/tools/llvm-config/llvm-config.cpp