| 1 |
commit: 0e88b50e735df339e4493f512c5e8178f9ffa1f4 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 2 20:41:22 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 2 20:41:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e88b50e |
| 7 |
|
| 8 |
media-libs/harfbuzz: Fixed python script shebangs |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/762415 |
| 11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/harfbuzz/harfbuzz-2.7.4.ebuild | 12 +++++++++--- |
| 15 |
media-libs/harfbuzz/harfbuzz-9999.ebuild | 14 ++++++++++---- |
| 16 |
2 files changed, 19 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild |
| 19 |
index 89e06e272b9..19566a5b8ed 100644 |
| 20 |
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild |
| 21 |
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
-# Copyright 1999-2020 Gentoo Authors |
| 24 |
+# Copyright 1999-2021 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=7 |
| 28 |
|
| 29 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
| 30 |
+PYTHON_COMPAT=( python3_{6..9} ) |
| 31 |
|
| 32 |
inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils |
| 33 |
|
| 34 |
@@ -44,7 +44,7 @@ BDEPEND=" |
| 35 |
" |
| 36 |
|
| 37 |
pkg_setup() { |
| 38 |
- use test && python-any-r1_pkg_setup |
| 39 |
+ python-any-r1_pkg_setup |
| 40 |
if ! use debug ; then |
| 41 |
append-cppflags -DHB_NDEBUG |
| 42 |
fi |
| 43 |
@@ -62,6 +62,12 @@ src_prepare() { |
| 44 |
|
| 45 |
# bug 618772 |
| 46 |
append-cxxflags -std=c++14 |
| 47 |
+ |
| 48 |
+ # bug 762415 |
| 49 |
+ local pyscript |
| 50 |
+ for pyscript in $(find -type f -name "*.py") ; do |
| 51 |
+ python_fix_shebang -q "${pyscript}" |
| 52 |
+ done |
| 53 |
} |
| 54 |
|
| 55 |
meson_multilib_native_feature() { |
| 56 |
|
| 57 |
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 58 |
index d8d69233362..19566a5b8ed 100644 |
| 59 |
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 60 |
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 61 |
@@ -1,9 +1,9 @@ |
| 62 |
-# Copyright 1999-2020 Gentoo Authors |
| 63 |
+# Copyright 1999-2021 Gentoo Authors |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
|
| 66 |
EAPI=7 |
| 67 |
|
| 68 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
| 69 |
+PYTHON_COMPAT=( python3_{6..9} ) |
| 70 |
|
| 71 |
inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils |
| 72 |
|
| 73 |
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then |
| 74 |
inherit git-r3 |
| 75 |
else |
| 76 |
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 77 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 78 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 79 |
fi |
| 80 |
|
| 81 |
LICENSE="Old-MIT ISC icu" |
| 82 |
@@ -44,7 +44,7 @@ BDEPEND=" |
| 83 |
" |
| 84 |
|
| 85 |
pkg_setup() { |
| 86 |
- use test && python-any-r1_pkg_setup |
| 87 |
+ python-any-r1_pkg_setup |
| 88 |
if ! use debug ; then |
| 89 |
append-cppflags -DHB_NDEBUG |
| 90 |
fi |
| 91 |
@@ -62,6 +62,12 @@ src_prepare() { |
| 92 |
|
| 93 |
# bug 618772 |
| 94 |
append-cxxflags -std=c++14 |
| 95 |
+ |
| 96 |
+ # bug 762415 |
| 97 |
+ local pyscript |
| 98 |
+ for pyscript in $(find -type f -name "*.py") ; do |
| 99 |
+ python_fix_shebang -q "${pyscript}" |
| 100 |
+ done |
| 101 |
} |
| 102 |
|
| 103 |
meson_multilib_native_feature() { |
Archives