commit: fefd85b193e5a8b51d86a63def58294831f86e61
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 03:47:55 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 01:14:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefd85b1
media-libs/harfbuzz: Switch to meson-multilib
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/harfbuzz/harfbuzz-2.7.4.ebuild | 30 +++++-------------------------
media-libs/harfbuzz/harfbuzz-2.8.0.ebuild | 30 +++++-------------------------
media-libs/harfbuzz/harfbuzz-2.8.1.ebuild | 30 +++++-------------------------
media-libs/harfbuzz/harfbuzz-9999.ebuild | 30 +++++-------------------------
4 files changed, 20 insertions(+), 100 deletions(-)
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
index faa0655ca20..453389b6331 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz";
@@ -73,23 +73,15 @@ src_prepare() {
done
}
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
multilib_src_configure() {
# harfbuzz-gobject only used for instrospection, bug #535852
local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
+ $(meson_native_use_feature cairo)
-Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
+ $(meson_native_use_feature doc)
-Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
+ $(meson_native_use_feature introspection)
+ $(meson_use static-libs static)
$(meson_feature glib)
$(meson_feature graphite)
$(meson_feature icu)
@@ -99,15 +91,3 @@ multilib_src_configure() {
)
meson_src_configure
}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
index 48efc9f4fcb..9f52c19d342 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz";
@@ -73,23 +73,15 @@ src_prepare() {
done
}
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
multilib_src_configure() {
# harfbuzz-gobject only used for instrospection, bug #535852
local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
+ $(meson_native_use_feature cairo)
-Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
+ $(meson_native_use_feature doc)
-Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
+ $(meson_native_use_feature introspection)
+ $(meson_use static-libs static)
$(meson_feature glib)
$(meson_feature graphite)
$(meson_feature icu)
@@ -99,15 +91,3 @@ multilib_src_configure() {
)
meson_src_configure
}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
index faa0655ca20..453389b6331 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz";
@@ -73,23 +73,15 @@ src_prepare() {
done
}
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
multilib_src_configure() {
# harfbuzz-gobject only used for instrospection, bug #535852
local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
+ $(meson_native_use_feature cairo)
-Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
+ $(meson_native_use_feature doc)
-Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
+ $(meson_native_use_feature introspection)
+ $(meson_use static-libs static)
$(meson_feature glib)
$(meson_feature graphite)
$(meson_feature icu)
@@ -99,15 +91,3 @@ multilib_src_configure() {
)
meson_src_configure
}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild
b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 48efc9f4fcb..9f52c19d342 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz";
@@ -73,23 +73,15 @@ src_prepare() {
done
}
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
multilib_src_configure() {
# harfbuzz-gobject only used for instrospection, bug #535852
local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
+ $(meson_native_use_feature cairo)
-Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
+ $(meson_native_use_feature doc)
-Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
+ $(meson_native_use_feature introspection)
+ $(meson_use static-libs static)
$(meson_feature glib)
$(meson_feature graphite)
$(meson_feature icu)
@@ -99,15 +91,3 @@ multilib_src_configure() {
)
meson_src_configure
}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
