gentoo resync : 21.09.2018

8 files changed, 74 insertions, 6 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 6890b5b0f2e4..afbb53287f20 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 176044dee8d3..b66e74ed2f15 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -3,10 +3,12 @@ DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3d
 DIST brotli-1.0.3.tar.gz 23815300 BLAKE2B 9569267782a8159d290e0f1b524a985144d1ae68a45a732443aca973dd0407c50249ce62389848d97cbc33eba3062ba471064570418c36158b97935ae4b7fb73 SHA512 93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c
 DIST brotli-1.0.4.tar.gz 23819000 BLAKE2B 5c0a7ed2cb7e15722c2f08dbaaaa5e74f10a03b95961d77db285fac437a489158cf8f7d43a55fac75eb5423951286accf0285e3e3471e34e35868a69dbf42f16 SHA512 7d41ad37ca0755ba9e08e7355fb031e24a53a5f6d44ff827adee6d9712765af02142cb463ef558f92449ce3b73e559cffb52315a329ab702f4c46927f993b616
 DIST brotli-1.0.5.tar.gz 23825684 BLAKE2B b179f75f3e452bdd3fabbd74d9172bc0a00f797e7facf7a9061e5e81c52148297ea7dd8ab9954c3f596f59e2a96cb22ef057c4c02b1bba4ecf10db7b70e0711d SHA512 703cad94c7f250133d2cfe222f3183612c7649b184bba218907b805f423568046d42695f33acf7da95daf684be118c9d631cfa5706e5a195b611c716db4c839a
+DIST brotli-1.0.6.tar.gz 23827656 BLAKE2B 8d31eb1c4119de44702f2239fba9db72f1ae81801d06e51716432ff2f8aa78259c52cbd57b8fcd005c1bc14ada81b6e47a35c5d3864bb10bb02d113e30bd321b SHA512 b9847375471de3ae815ef4bb45a29653c343fad0a891a79d5132fcdee34c85caafd82289c8b413c3ef609049f2e8c4af9f9abd1736a2408ba44544c5fefc0010
 EBUILD brotli-1.0.2.ebuild 1440 BLAKE2B 5c9bff9a21dd9aa71846f75615d5d0aaea5ec7ecbfe0b746e3b2acfa366d1a6ce5e0c0bf138371be86281b85162f049ddfad648caeb917b5be53f672c20817dc SHA512 c006f254c8485a49e12ee13d5cfdad25ebe9535446f3f0f335dce5b8ccd887b41d598365796f80f758bc3522677dc6c9e8c2e54f5ce4c9aa10416916a34b9a9b
 EBUILD brotli-1.0.3-r1.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
 EBUILD brotli-1.0.3.ebuild 1398 BLAKE2B 7cce4fc14efb56d134eea51714e12c1dde687a5d57daa2d27a94d39358a26633dfb0a380872bc9a32e32c4d772fa8602eacd5f857c85f4dd5e096c4783b63e93 SHA512 8210643e246c6172946577112adb0bd721f2a4810461db192ec2b2e2bb7ca917b5dde061ce760aedfc7d908a5944ec4dc89ace253adf79b0337b0bb2b0f2cbef
 EBUILD brotli-1.0.4.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
 EBUILD brotli-1.0.5.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
-EBUILD brotli-9999.ebuild 1423 BLAKE2B f1b4d9b2f69532f1c262f66350744cf5deab65ea68cbcdaa136670cb8e26226f3b13acf8c16d2f1adb3002a9b3fbe22bfd7750d2912585b19da8493c281ecdc4 SHA512 f2b97bb2a14d6f36d58b9905dea34816ea630d6b582b9f8ee69ba59470cc55833e2753e6b37d45d5f2c7f4cc785a604d8d3857c46b8a79dc823b5be3cbb998c8
+EBUILD brotli-1.0.6.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
+EBUILD brotli-9999.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.6.ebuild b/app-arch/brotli/brotli-1.0.6.ebuild
new file mode 100644
index 000000000000..d6d1f9946eb2
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1 eapi7-ver
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 13c06932944f..d6d1f9946eb2 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 613788f6601a..6fb7178c1845 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -6,5 +6,5 @@ DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
 EBUILD libarchive-3.3.1.ebuild 3410 BLAKE2B 363e6f4731908898dc77fc8ee8a9b46dcea994ffd53b23ddd47f0e9d633c13f78b909cbcba378309b61d4ae00bf2628e1fa890c299c2ab8081aa930bd8070f61 SHA512 77ea559d3ff56fd954c75724aa5d60b2b979f6391cb5dad1f486fef383ed7ede4bb58b9663fbd1cca495f063a6f9dc47d4760ab619be24463f33ffc5f44e1143
 EBUILD libarchive-3.3.2.ebuild 3481 BLAKE2B 18b182565f8a772bf80d3667a1f8f68e0597cb3e87e07f26d2382cd454e6686d2efa71b6a44048ac682bf38332fe1cb76a5ac4d1f00e0cf40d32e5a79ec1f7e4 SHA512 b766886db04b4e660bff08e6ce1a02ce6b05a1b553fb937037192e201523d3841fb307e715e71a568a41d8b5c99bd9f709c4fedc702cff4c7b0bc483c445d7ce
-EBUILD libarchive-3.3.3.ebuild 3474 BLAKE2B dd8f4a86ec55e688869c9df84a80414d92a6eb115086d4a0cb9bc3e7eba61c0c084ea101718f3a0fe819c04df73ac9e8178a250469b4ce585dd5743fd34bc9b0 SHA512 a95ec1eb2ed4082f5641040fa773295f6adc02898c1555b9c16e7ce66d24e853666efee2dea17189685cbdd37fe737287e15e01c950e732858610716dec1bf99
+EBUILD libarchive-3.3.3.ebuild 3495 BLAKE2B 4a63454fc3d8720c1f8b2fd9f94bb166cdc0307a5edc7a9b314887fa0545fbc9e61f14a0d9fe0ae9c2e600a1bc0141b244ae1e4f62625bda2b64f7b21a5814d0 SHA512 dec666f51acc70555d3c372d6aebc48ae3f6f7a07199b17be896599008a6aa1b613f967ca82653cdda3ed88b02fc9e56aa1a0db2d7cbd8dfb2e8cd3c883905e2
 MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
diff --git a/app-arch/libarchive/libarchive-3.3.3.ebuild b/app-arch/libarchive/libarchive-3.3.3.ebuild
index 18f015656af7..6a0dcca27ef5 100644
--- a/app-arch/libarchive/libarchive-3.3.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.3.ebuild
@@ -119,7 +119,7 @@ multilib_src_install() {
 	fi
 
 	# Libs.private: should be used from libarchive.pc instead
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
 
 multilib_src_install_all() {
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index fcb4ea033130..1dd724d6bd25 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,4 +1,4 @@
 DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7
-EBUILD pixz-1.0.6.ebuild 1130 BLAKE2B a8e0cda41098d1e1567ef731d652eec7d9e049708de6b7e57cae44066effc63407f31ffcd377fd487a08770efde384a60b6bdbceee881039bb6e62d5019e8a7e SHA512 da5fe01a5cc81526166174737f296e30e2540eef9c2a7b6f66386110280c51c6053b8482df4277c98e6f88c8cb5f8523fe1866d5d648a2f45cee418979240bfe
+EBUILD pixz-1.0.6.ebuild 1129 BLAKE2B e5ca5eb79990e3131dc834d23d79f4d76e1625da66f167764a679362b032cdd5f900e5f582037765456000bbc0e68781c43323fe6003d917a0f3d465ec255f44 SHA512 a7ba1aca5481d1d92dc35e4e8457a1c5c7a8d65b2df7f31b7cbe845e2f88d247cf5ad9e588b4a017c5d97fe030ac070c0bbcf362f222d0e73596e2581d177f2e
 EBUILD pixz-9999.ebuild 1133 BLAKE2B 1df4240b4409c81ce3a28ac47a276954e3b977c1964411c995e8335da4246fd79350be5c1543b5ab896230fb81a28c6aa8ec7be26b0e5d87d2bf0c45f1cb8a7c SHA512 350b2274074199349d2724816d233df340c015a2fa2efc228bae5bf35838a92ce91150e9d3b0bc86cca7433830288876da11d6217a79bd4495d8e5ae974dab16
 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/pixz-1.0.6.ebuild b/app-arch/pixz/pixz-1.0.6.ebuild
index c27e22add028..bd8d4125bb53 100644
--- a/app-arch/pixz/pixz-1.0.6.ebuild
+++ b/app-arch/pixz/pixz-1.0.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"