| 1 |
commit: ff7b873431bf91717129e0646e923fe60fee1ab6 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 28 15:37:14 2018 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 28 15:37:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7b8734 |
| 7 |
|
| 8 |
app-arch/brotli: make multilib |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/650104 |
| 11 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 12 |
|
| 13 |
.../{brotli-9999.ebuild => brotli-1.0.6-r1.ebuild} | 26 ++++++++++++++++------ |
| 14 |
app-arch/brotli/brotli-9999.ebuild | 26 ++++++++++++++++------ |
| 15 |
2 files changed, 38 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild |
| 18 |
similarity index 80% |
| 19 |
copy from app-arch/brotli/brotli-9999.ebuild |
| 20 |
copy to app-arch/brotli/brotli-1.0.6-r1.ebuild |
| 21 |
index d6d1f9946eb..72733671f1d 100644 |
| 22 |
--- a/app-arch/brotli/brotli-9999.ebuild |
| 23 |
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild |
| 24 |
@@ -1,12 +1,13 @@ |
| 25 |
-# Copyright 1999-2018 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
|
| 31 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy ) |
| 32 |
DISTUTILS_OPTIONAL="1" |
| 33 |
+DISTUTILS_IN_SOURCE_BUILD="1" |
| 34 |
|
| 35 |
-inherit cmake-utils distutils-r1 eapi7-ver |
| 36 |
+inherit cmake-multilib distutils-r1 eapi7-ver |
| 37 |
|
| 38 |
DESCRIPTION="Generic-purpose lossless compression algorithm" |
| 39 |
HOMEPAGE="https://github.com/google/brotli" |
| 40 |
@@ -33,21 +34,27 @@ else |
| 41 |
fi |
| 42 |
|
| 43 |
src_prepare() { |
| 44 |
- cmake-utils_src_prepare |
| 45 |
use python && distutils-r1_src_prepare |
| 46 |
+ cmake-utils_src_prepare |
| 47 |
} |
| 48 |
|
| 49 |
-src_configure() { |
| 50 |
+multilib_src_configure() { |
| 51 |
local mycmakeargs=( |
| 52 |
-DBUILD_SHARED_LIBS=ON |
| 53 |
-DBUILD_TESTING="$(usex test)" |
| 54 |
) |
| 55 |
cmake-utils_src_configure |
| 56 |
+} |
| 57 |
+src_configure() { |
| 58 |
+ cmake-multilib_src_configure |
| 59 |
use python && distutils-r1_src_configure |
| 60 |
} |
| 61 |
|
| 62 |
-src_compile() { |
| 63 |
+multilib_src_compile() { |
| 64 |
cmake-utils_src_compile |
| 65 |
+} |
| 66 |
+src_compile() { |
| 67 |
+ cmake-multilib_src_compile |
| 68 |
use python && distutils-r1_src_compile |
| 69 |
} |
| 70 |
|
| 71 |
@@ -55,12 +62,17 @@ python_test(){ |
| 72 |
esetup.py test || die |
| 73 |
} |
| 74 |
|
| 75 |
-src_test() { |
| 76 |
+multilib_src_test() { |
| 77 |
cmake-utils_src_test |
| 78 |
+} |
| 79 |
+src_test() { |
| 80 |
+ cmake-multilib_src_test |
| 81 |
use python && distutils-r1_src_test |
| 82 |
} |
| 83 |
|
| 84 |
-src_install() { |
| 85 |
+multilib_src_install() { |
| 86 |
cmake-utils_src_install |
| 87 |
+} |
| 88 |
+multilib_src_install_all() { |
| 89 |
use python && distutils-r1_src_install |
| 90 |
} |
| 91 |
|
| 92 |
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild |
| 93 |
index d6d1f9946eb..72733671f1d 100644 |
| 94 |
--- a/app-arch/brotli/brotli-9999.ebuild |
| 95 |
+++ b/app-arch/brotli/brotli-9999.ebuild |
| 96 |
@@ -1,12 +1,13 @@ |
| 97 |
-# Copyright 1999-2018 Gentoo Foundation |
| 98 |
+# Copyright 1999-2018 Gentoo Authors |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
|
| 101 |
EAPI=6 |
| 102 |
|
| 103 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy ) |
| 104 |
DISTUTILS_OPTIONAL="1" |
| 105 |
+DISTUTILS_IN_SOURCE_BUILD="1" |
| 106 |
|
| 107 |
-inherit cmake-utils distutils-r1 eapi7-ver |
| 108 |
+inherit cmake-multilib distutils-r1 eapi7-ver |
| 109 |
|
| 110 |
DESCRIPTION="Generic-purpose lossless compression algorithm" |
| 111 |
HOMEPAGE="https://github.com/google/brotli" |
| 112 |
@@ -33,21 +34,27 @@ else |
| 113 |
fi |
| 114 |
|
| 115 |
src_prepare() { |
| 116 |
- cmake-utils_src_prepare |
| 117 |
use python && distutils-r1_src_prepare |
| 118 |
+ cmake-utils_src_prepare |
| 119 |
} |
| 120 |
|
| 121 |
-src_configure() { |
| 122 |
+multilib_src_configure() { |
| 123 |
local mycmakeargs=( |
| 124 |
-DBUILD_SHARED_LIBS=ON |
| 125 |
-DBUILD_TESTING="$(usex test)" |
| 126 |
) |
| 127 |
cmake-utils_src_configure |
| 128 |
+} |
| 129 |
+src_configure() { |
| 130 |
+ cmake-multilib_src_configure |
| 131 |
use python && distutils-r1_src_configure |
| 132 |
} |
| 133 |
|
| 134 |
-src_compile() { |
| 135 |
+multilib_src_compile() { |
| 136 |
cmake-utils_src_compile |
| 137 |
+} |
| 138 |
+src_compile() { |
| 139 |
+ cmake-multilib_src_compile |
| 140 |
use python && distutils-r1_src_compile |
| 141 |
} |
| 142 |
|
| 143 |
@@ -55,12 +62,17 @@ python_test(){ |
| 144 |
esetup.py test || die |
| 145 |
} |
| 146 |
|
| 147 |
-src_test() { |
| 148 |
+multilib_src_test() { |
| 149 |
cmake-utils_src_test |
| 150 |
+} |
| 151 |
+src_test() { |
| 152 |
+ cmake-multilib_src_test |
| 153 |
use python && distutils-r1_src_test |
| 154 |
} |
| 155 |
|
| 156 |
-src_install() { |
| 157 |
+multilib_src_install() { |
| 158 |
cmake-utils_src_install |
| 159 |
+} |
| 160 |
+multilib_src_install_all() { |
| 161 |
use python && distutils-r1_src_install |
| 162 |
} |
Archives