gentoo resync : 30.09.2018

3 files changed, 99 insertions, 8 deletions

diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index b66e74ed2f15..09312a5c95a5 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -9,6 +9,7 @@ EBUILD brotli-1.0.3-r1.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005cc
 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-1.0.6-r1.ebuild 1691 BLAKE2B ac938a509d769927e26940b3609920e677b7ee28666c432a5c6bba3136c0d5079dd6851cf69ebb40706ec62a2999584b5640bd7796adf8a828ec1f1c294bcbd1 SHA512 7fbd54a327c2d8cbde9816f3dbd9f7545d5ff1bab76df2bb5f3c43cf1382e17f4b7bcae71384bb164d8ddea7e0272e062a7df8745a4e3eee3b9be7c2c1c06749
 EBUILD brotli-1.0.6.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
-EBUILD brotli-9999.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
+EBUILD brotli-9999.ebuild 1691 BLAKE2B ac938a509d769927e26940b3609920e677b7ee28666c432a5c6bba3136c0d5079dd6851cf69ebb40706ec62a2999584b5640bd7796adf8a828ec1f1c294bcbd1 SHA512 7fbd54a327c2d8cbde9816f3dbd9f7545d5ff1bab76df2bb5f3c43cf1382e17f4b7bcae71384bb164d8ddea7e0272e062a7df8745a4e3eee3b9be7c2c1c06749
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..72733671f1db
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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"
+DISTUTILS_IN_SOURCE_BUILD="1"
+
+inherit cmake-multilib 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() {
+	use python && distutils-r1_src_prepare
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+src_configure() {
+	cmake-multilib_src_configure
+	use python && distutils-r1_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+src_compile() {
+	cmake-multilib_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+multilib_src_test() {
+	cmake-utils_src_test
+}
+src_test() {
+	cmake-multilib_src_test
+	use python && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+multilib_src_install_all() {
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index d6d1f9946eb2..72733671f1db 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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"
+DISTUTILS_IN_SOURCE_BUILD="1"
 
-inherit cmake-utils distutils-r1 eapi7-ver
+inherit cmake-multilib distutils-r1 eapi7-ver
 
 DESCRIPTION="Generic-purpose lossless compression algorithm"
 HOMEPAGE="https://github.com/google/brotli"
@@ -33,21 +34,27 @@ else
 fi
 
 src_prepare() {
-	cmake-utils_src_prepare
 	use python && distutils-r1_src_prepare
+	cmake-utils_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_TESTING="$(usex test)"
 	)
 	cmake-utils_src_configure
+}
+src_configure() {
+	cmake-multilib_src_configure
 	use python && distutils-r1_src_configure
 }
 
-src_compile() {
+multilib_src_compile() {
 	cmake-utils_src_compile
+}
+src_compile() {
+	cmake-multilib_src_compile
 	use python && distutils-r1_src_compile
 }
 
@@ -55,12 +62,17 @@ python_test(){
 	esetup.py test || die
 }
 
-src_test() {
+multilib_src_test() {
 	cmake-utils_src_test
+}
+src_test() {
+	cmake-multilib_src_test
 	use python && distutils-r1_src_test
 }
 
-src_install() {
+multilib_src_install() {
 	cmake-utils_src_install
+}
+multilib_src_install_all() {
 	use python && distutils-r1_src_install
 }