commit: ff7b873431bf91717129e0646e923fe60fee1ab6 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Fri Sep 28 15:37:14 2018 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Fri Sep 28 15:37:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7b8734
app-arch/brotli: make multilib Bug: https://bugs.gentoo.org/650104 Package-Manager: Portage-2.3.50, Repoman-2.3.11 .../{brotli-9999.ebuild => brotli-1.0.6-r1.ebuild} | 26 ++++++++++++++++------ app-arch/brotli/brotli-9999.ebuild | 26 ++++++++++++++++------ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild similarity index 80% copy from app-arch/brotli/brotli-9999.ebuild copy to app-arch/brotli/brotli-1.0.6-r1.ebuild index d6d1f9946eb..72733671f1d 100644 --- a/app-arch/brotli/brotli-9999.ebuild +++ b/app-arch/brotli/brotli-1.0.6-r1.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 } diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild index d6d1f9946eb..72733671f1d 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 }
