app-arch/brotli: make multilib

Bug: https://bugs.gentoo.org/650104
Package-Manager: Portage-2.3.50, Repoman-2.3.11

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 (file)
index 0000000..7273367
--- /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 d6d1f9946eb22906fe0bd32d3cc110d800d32eb1..72733671f1dbbc35da461aa6623758881689c7bf 100644 (file)
--- 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
 }