| 1 |
commit: 38cc525db6db66713207f49686e10ede64776d81 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 4 17:14:06 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 4 17:14:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cc525d |
| 7 |
|
| 8 |
app-arch/brotli: Switch back to cmake-utils.eclass |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-arch/brotli/brotli-1.0.7.ebuild | 14 +++++++------- |
| 14 |
app-arch/brotli/brotli-9999.ebuild | 14 +++++++------- |
| 15 |
2 files changed, 14 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild |
| 18 |
index fec4aa455a7..dd0a67b6a93 100644 |
| 19 |
--- a/app-arch/brotli/brotli-1.0.7.ebuild |
| 20 |
+++ b/app-arch/brotli/brotli-1.0.7.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2019 Gentoo Authors |
| 23 |
+# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 28 |
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) |
| 29 |
DISTUTILS_OPTIONAL="1" |
| 30 |
DISTUTILS_IN_SOURCE_BUILD="1" |
| 31 |
-CMAKE_ECLASS=cmake |
| 32 |
+ |
| 33 |
inherit cmake-multilib distutils-r1 |
| 34 |
|
| 35 |
DESCRIPTION="Generic-purpose lossless compression algorithm" |
| 36 |
@@ -37,14 +37,14 @@ RESTRICT="!test? ( test )" |
| 37 |
|
| 38 |
src_prepare() { |
| 39 |
use python && distutils-r1_src_prepare |
| 40 |
- cmake_src_prepare |
| 41 |
+ cmake-utils_src_prepare |
| 42 |
} |
| 43 |
|
| 44 |
multilib_src_configure() { |
| 45 |
local mycmakeargs=( |
| 46 |
-DBUILD_TESTING="$(usex test)" |
| 47 |
) |
| 48 |
- cmake_src_configure |
| 49 |
+ cmake-utils_src_configure |
| 50 |
} |
| 51 |
src_configure() { |
| 52 |
cmake-multilib_src_configure |
| 53 |
@@ -52,7 +52,7 @@ src_configure() { |
| 54 |
} |
| 55 |
|
| 56 |
multilib_src_compile() { |
| 57 |
- cmake_src_compile |
| 58 |
+ cmake-utils_src_compile |
| 59 |
} |
| 60 |
src_compile() { |
| 61 |
cmake-multilib_src_compile |
| 62 |
@@ -64,7 +64,7 @@ python_test(){ |
| 63 |
} |
| 64 |
|
| 65 |
multilib_src_test() { |
| 66 |
- cmake_src_test |
| 67 |
+ cmake-utils_src_test |
| 68 |
} |
| 69 |
src_test() { |
| 70 |
cmake-multilib_src_test |
| 71 |
@@ -72,7 +72,7 @@ src_test() { |
| 72 |
} |
| 73 |
|
| 74 |
multilib_src_install() { |
| 75 |
- cmake_src_install |
| 76 |
+ cmake-utils_src_install |
| 77 |
} |
| 78 |
multilib_src_install_all() { |
| 79 |
use python && distutils-r1_src_install |
| 80 |
|
| 81 |
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild |
| 82 |
index 26f80b64ecb..8cc58bf0272 100644 |
| 83 |
--- a/app-arch/brotli/brotli-9999.ebuild |
| 84 |
+++ b/app-arch/brotli/brotli-9999.ebuild |
| 85 |
@@ -1,4 +1,4 @@ |
| 86 |
-# Copyright 1999-2019 Gentoo Authors |
| 87 |
+# Copyright 1999-2020 Gentoo Authors |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
|
| 90 |
EAPI=7 |
| 91 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 92 |
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) |
| 93 |
DISTUTILS_OPTIONAL="1" |
| 94 |
DISTUTILS_IN_SOURCE_BUILD="1" |
| 95 |
-CMAKE_ECLASS=cmake |
| 96 |
+ |
| 97 |
inherit cmake-multilib distutils-r1 |
| 98 |
|
| 99 |
DESCRIPTION="Generic-purpose lossless compression algorithm" |
| 100 |
@@ -37,14 +37,14 @@ RESTRICT="!test? ( test )" |
| 101 |
|
| 102 |
src_prepare() { |
| 103 |
use python && distutils-r1_src_prepare |
| 104 |
- cmake_src_prepare |
| 105 |
+ cmake-utils_src_prepare |
| 106 |
} |
| 107 |
|
| 108 |
multilib_src_configure() { |
| 109 |
local mycmakeargs=( |
| 110 |
-DBUILD_TESTING="$(usex test)" |
| 111 |
) |
| 112 |
- cmake_src_configure |
| 113 |
+ cmake-utils_src_configure |
| 114 |
} |
| 115 |
src_configure() { |
| 116 |
cmake-multilib_src_configure |
| 117 |
@@ -52,7 +52,7 @@ src_configure() { |
| 118 |
} |
| 119 |
|
| 120 |
multilib_src_compile() { |
| 121 |
- cmake_src_compile |
| 122 |
+ cmake-utils_src_compile |
| 123 |
} |
| 124 |
src_compile() { |
| 125 |
cmake-multilib_src_compile |
| 126 |
@@ -64,7 +64,7 @@ python_test(){ |
| 127 |
} |
| 128 |
|
| 129 |
multilib_src_test() { |
| 130 |
- cmake_src_test |
| 131 |
+ cmake-utils_src_test |
| 132 |
} |
| 133 |
src_test() { |
| 134 |
cmake-multilib_src_test |
| 135 |
@@ -72,7 +72,7 @@ src_test() { |
| 136 |
} |
| 137 |
|
| 138 |
multilib_src_install() { |
| 139 |
- cmake_src_install |
| 140 |
+ cmake-utils_src_install |
| 141 |
} |
| 142 |
multilib_src_install_all() { |
| 143 |
use python && distutils-r1_src_install |
Archives