| 1 |
commit: 1c7a7121ba5a02af6fb6c194135dcb7040b97a1c |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 24 20:59:02 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 24 20:59:18 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7a7121 |
| 7 |
|
| 8 |
media-libs/x265: switch to cmake-multilib eclass |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/x265/x265-3.3.ebuild | 9 +++++---- |
| 14 |
media-libs/x265/x265-9999.ebuild | 9 +++++---- |
| 15 |
2 files changed, 10 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild |
| 18 |
index 9428b001e84..96fa1f5e454 100644 |
| 19 |
--- a/media-libs/x265/x265-3.3.ebuild |
| 20 |
+++ b/media-libs/x265/x265-3.3.ebuild |
| 21 |
@@ -3,7 +3,8 @@ |
| 22 |
|
| 23 |
EAPI="7" |
| 24 |
|
| 25 |
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic |
| 26 |
+CMAKE_ECLASS=cmake |
| 27 |
+inherit flag-o-matic multibuild cmake-multilib |
| 28 |
|
| 29 |
if [[ ${PV} = 9999* ]]; then |
| 30 |
inherit mercurial |
| 31 |
@@ -117,7 +118,7 @@ x265_variant_src_configure() { |
| 32 |
die "Unknown variant: ${MULTIBUILD_VARIANT}";; |
| 33 |
esac |
| 34 |
|
| 35 |
- cmake-utils_src_configure |
| 36 |
+ cmake_src_configure |
| 37 |
popd >/dev/null || die |
| 38 |
} |
| 39 |
|
| 40 |
@@ -173,7 +174,7 @@ multilib_src_configure() { |
| 41 |
|
| 42 |
multilib_src_compile() { |
| 43 |
local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) |
| 44 |
- multibuild_foreach_variant cmake-utils_src_compile |
| 45 |
+ multibuild_foreach_variant cmake_src_compile |
| 46 |
} |
| 47 |
|
| 48 |
x265_variant_src_test() { |
| 49 |
@@ -194,7 +195,7 @@ multilib_src_test() { |
| 50 |
multilib_src_install() { |
| 51 |
# Install only "main" variant since the others are already linked into it. |
| 52 |
local MULTIBUILD_VARIANTS=( "main" ) |
| 53 |
- multibuild_foreach_variant cmake-utils_src_install |
| 54 |
+ multibuild_foreach_variant cmake_src_install |
| 55 |
} |
| 56 |
|
| 57 |
multilib_src_install_all() { |
| 58 |
|
| 59 |
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild |
| 60 |
index 9428b001e84..96fa1f5e454 100644 |
| 61 |
--- a/media-libs/x265/x265-9999.ebuild |
| 62 |
+++ b/media-libs/x265/x265-9999.ebuild |
| 63 |
@@ -3,7 +3,8 @@ |
| 64 |
|
| 65 |
EAPI="7" |
| 66 |
|
| 67 |
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic |
| 68 |
+CMAKE_ECLASS=cmake |
| 69 |
+inherit flag-o-matic multibuild cmake-multilib |
| 70 |
|
| 71 |
if [[ ${PV} = 9999* ]]; then |
| 72 |
inherit mercurial |
| 73 |
@@ -117,7 +118,7 @@ x265_variant_src_configure() { |
| 74 |
die "Unknown variant: ${MULTIBUILD_VARIANT}";; |
| 75 |
esac |
| 76 |
|
| 77 |
- cmake-utils_src_configure |
| 78 |
+ cmake_src_configure |
| 79 |
popd >/dev/null || die |
| 80 |
} |
| 81 |
|
| 82 |
@@ -173,7 +174,7 @@ multilib_src_configure() { |
| 83 |
|
| 84 |
multilib_src_compile() { |
| 85 |
local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) |
| 86 |
- multibuild_foreach_variant cmake-utils_src_compile |
| 87 |
+ multibuild_foreach_variant cmake_src_compile |
| 88 |
} |
| 89 |
|
| 90 |
x265_variant_src_test() { |
| 91 |
@@ -194,7 +195,7 @@ multilib_src_test() { |
| 92 |
multilib_src_install() { |
| 93 |
# Install only "main" variant since the others are already linked into it. |
| 94 |
local MULTIBUILD_VARIANTS=( "main" ) |
| 95 |
- multibuild_foreach_variant cmake-utils_src_install |
| 96 |
+ multibuild_foreach_variant cmake_src_install |
| 97 |
} |
| 98 |
|
| 99 |
multilib_src_install_all() { |
Archives