From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9C371382C5 for ; Sat, 2 Jan 2021 20:41:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 066E0E083D; Sat, 2 Jan 2021 20:41:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D19BBE083D for ; Sat, 2 Jan 2021 20:41:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4269F340B81 for ; Sat, 2 Jan 2021 20:41:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1D5ECC for ; Sat, 2 Jan 2021 20:41:42 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1609620099.0e88b50e735df339e4493f512c5e8178f9ffa1f4.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/harfbuzz-2.7.4.ebuild media-libs/harfbuzz/harfbuzz-9999.ebuild X-VCS-Directories: media-libs/harfbuzz/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 0e88b50e735df339e4493f512c5e8178f9ffa1f4 X-VCS-Branch: master Date: Sat, 2 Jan 2021 20:41:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f3151590-679c-4eb8-9e3e-339fbbdcb545 X-Archives-Hash: 6133525c509b2b6c4a69ae5fc0376298 commit: 0e88b50e735df339e4493f512c5e8178f9ffa1f4 Author: Lars Wendler gentoo org> AuthorDate: Sat Jan 2 20:41:22 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Jan 2 20:41:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e88b50e media-libs/harfbuzz: Fixed python script shebangs Closes: https://bugs.gentoo.org/762415 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> media-libs/harfbuzz/harfbuzz-2.7.4.ebuild | 12 +++++++++--- media-libs/harfbuzz/harfbuzz-9999.ebuild | 14 ++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild index 89e06e272b9..19566a5b8ed 100644 --- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils @@ -44,7 +44,7 @@ BDEPEND=" " pkg_setup() { - use test && python-any-r1_pkg_setup + python-any-r1_pkg_setup if ! use debug ; then append-cppflags -DHB_NDEBUG fi @@ -62,6 +62,12 @@ src_prepare() { # bug 618772 append-cxxflags -std=c++14 + + # bug 762415 + local pyscript + for pyscript in $(find -type f -name "*.py") ; do + python_fix_shebang -q "${pyscript}" + done } meson_multilib_native_feature() { diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index d8d69233362..19566a5b8ed 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils @@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - 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" + 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" fi LICENSE="Old-MIT ISC icu" @@ -44,7 +44,7 @@ BDEPEND=" " pkg_setup() { - use test && python-any-r1_pkg_setup + python-any-r1_pkg_setup if ! use debug ; then append-cppflags -DHB_NDEBUG fi @@ -62,6 +62,12 @@ src_prepare() { # bug 618772 append-cxxflags -std=c++14 + + # bug 762415 + local pyscript + for pyscript in $(find -type f -name "*.py") ; do + python_fix_shebang -q "${pyscript}" + done } meson_multilib_native_feature() {