commit:     84b03819d63453f8a85a2182cb78d1bc5631f444
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 10:29:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 10:31:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b03819

media-libs/harfbuzz: add 9.0.0

Drop some old workarounds while at it:
* bug #762415's workaround was broken (see last comment) but we've been
  using Meson for a while now and in this release upstream moved to
  Meson-only.

* bug #931090's workaround is obsolete as upstream have implemented it
  in meson.build.

It looks like we don't need the Python bits anymore either.

Bug: https://bugs.gentoo.org/762415
Bug: https://bugs.gentoo.org/931090
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/harfbuzz/Manifest                              |  1 +
 .../{harfbuzz-9999.ebuild => harfbuzz-9.0.0.ebuild}       | 15 ---------------
 media-libs/harfbuzz/harfbuzz-9999.ebuild                  | 15 ---------------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 5842e5c19dd1..44249cf85f90 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,3 +2,4 @@ DIST harfbuzz-8.3.0.tar.xz 19002808 BLAKE2B 
3749d2ff7955e135cf0d740bf6fe8b5c20a6
 DIST harfbuzz-8.3.1.tar.xz 19228384 BLAKE2B 
84a371284a281a19c3b1f6f9a47dd92060e6fe2b6f4d2469e45e5dbce58b0b151414fa70057bca352a626d8b852ac251168a9749ccac5436ee06280165d31821
 SHA512 
47bb8150faf215d317a434f78c3029261924aae5ff479fbd3a5d62dbbbfce159460fcbc6f53c3c8ec85b09fad5ae0c9d591d67a0ca70424f43ed5b7849eef4ea
 DIST harfbuzz-8.4.0.tar.xz 19241260 BLAKE2B 
03d6bf0f70354d01ee85edb9fb80d48a91301f862f94f66fddc57ec808105dbeea013e595e2ee616d364773bb68bf5135d4cd44f31a5d3894952a1dced98855c
 SHA512 
9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542
 DIST harfbuzz-8.5.0.tar.xz 19468172 BLAKE2B 
f598d7de953834499d1ab36c0fc9d95099fd7e99b87f630e1527aaa39deb2d339b9f3caaea3643238c6c1b321557f794f273929950b54fe9de2faa430d77855a
 SHA512 
d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c
+DIST harfbuzz-9.0.0.tar.xz 17895360 BLAKE2B 
fd35c41d25e77c96b1fc760b8ca0ffd1ac8f3382b51991bb28797d55c2171bf0700ac65266996bf5cab82b8e9c835c2fad9c8374d9c60d2a361c924d805afbf6
 SHA512 
2700b560727d9c4440ad9c74a170b857f20f9e553e5d98b0c4bcf086a25ba644149d7c89009a41d964af7a924efcc486da4dcbfa5cc4d47f9f10e9b6b8c689af

diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild 
b/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild
similarity index 89%
copy from media-libs/harfbuzz/harfbuzz-9999.ebuild
copy to media-libs/harfbuzz/harfbuzz-9.0.0.ebuild
index 3fd6ad53a21a..a5dd866908b4 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9.0.0.ebuild
@@ -49,32 +49,17 @@ src_prepare() {
 
        xdg_environment_reset
 
-       # bug #726120
-       sed -i \
-               -e '/tests\/macos\.tests/d' \
-               test/shape/data/in-house/Makefile.sources \
-               || die
-
        # bug #790359
        filter-flags -fexceptions -fthreadsafe-statics
 
        if ! use debug ; then
                append-cppflags -DHB_NDEBUG
        fi
-
-       # bug #762415
-       local pyscript
-       for pyscript in $(find -type f -name "*.py") ; do
-               python_fix_shebang -q "${pyscript}"
-       done
 }
 
 multilib_src_configure() {
        # harfbuzz-gobject only used for introspection, bug #535852
        local emesonargs=(
-               # ICU 75 needs C++17 (bug #931090)
-               -Dcpp_std=c++17
-
                -Dcoretext=disabled
                -Dchafa=disabled
                -Dwasm=disabled

diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild 
b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 3fd6ad53a21a..a5dd866908b4 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -49,32 +49,17 @@ src_prepare() {
 
        xdg_environment_reset
 
-       # bug #726120
-       sed -i \
-               -e '/tests\/macos\.tests/d' \
-               test/shape/data/in-house/Makefile.sources \
-               || die
-
        # bug #790359
        filter-flags -fexceptions -fthreadsafe-statics
 
        if ! use debug ; then
                append-cppflags -DHB_NDEBUG
        fi
-
-       # bug #762415
-       local pyscript
-       for pyscript in $(find -type f -name "*.py") ; do
-               python_fix_shebang -q "${pyscript}"
-       done
 }
 
 multilib_src_configure() {
        # harfbuzz-gobject only used for introspection, bug #535852
        local emesonargs=(
-               # ICU 75 needs C++17 (bug #931090)
-               -Dcpp_std=c++17
-
                -Dcoretext=disabled
                -Dchafa=disabled
                -Dwasm=disabled

Reply via email to