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 C5023138334 for ; Wed, 20 Nov 2019 18:24:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D574E0814; Wed, 20 Nov 2019 18:24:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DF7C9E0814 for ; Wed, 20 Nov 2019 18:24:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0F28034D14C for ; Wed, 20 Nov 2019 18:24:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D155E8A9 for ; Wed, 20 Nov 2019 18:24:24 +0000 (UTC) From: "Ian Whyman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Whyman" Message-ID: <1574274256.478aa705b11104a1a067877e02d959ad109a7b25.thev00d00@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch media-video/handbrake/handbrake-1.3.0-r1.ebuild media-video/handbrake/handbrake-1.3.0-r2.ebuild X-VCS-Directories: media-video/handbrake/ media-video/handbrake/files/ X-VCS-Committer: thev00d00 X-VCS-Committer-Name: Ian Whyman X-VCS-Revision: 478aa705b11104a1a067877e02d959ad109a7b25 X-VCS-Branch: master Date: Wed, 20 Nov 2019 18:24:24 +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: 44e8ae15-1899-48a8-998d-d8db024aa73a X-Archives-Hash: 8edf7f6727d52179fb4cc989a776e4a8 commit: 478aa705b11104a1a067877e02d959ad109a7b25 Author: Ian Whyman gentoo org> AuthorDate: Wed Nov 20 18:23:56 2019 +0000 Commit: Ian Whyman gentoo org> CommitDate: Wed Nov 20 18:24:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=478aa705 media-video/handbrake: Dont search for python The ebuild would prefer calling python3 even if the eclass had chosen a 2.7 version, upsetting python_wrapper_setup Closes: https://bugs.gentoo.org/700706 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Ian Whyman gentoo.org> .../handbrake-1.3.0-dont-search-for-python.patch | 27 ++++++++++++++++++++++ ...e-1.3.0-r1.ebuild => handbrake-1.3.0-r2.ebuild} | 7 +++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch new file mode 100644 index 00000000000..551a64ee381 --- /dev/null +++ b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch @@ -0,0 +1,27 @@ +diff --git a/configure b/configure +index 5c870e1d7..2f5834083 100755 +--- a/configure ++++ b/configure +@@ -14,20 +14,8 @@ inpath() + } + + if ( inpath bash ); then +- pp="" +- for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python +- do +- if ( inpath $p ); then +- pp="$p" +- break +- fi +- done +- if [ pp != "" ]; then +- exec $pp `dirname $0`/make/configure.py "$@" +- exit 0 +- else +- echo "ERROR: no suitable version of python found." +- fi ++ exec python `dirname $0`/make/configure.py "$@" ++ exit 0 + else + echo "ERROR: bash shell not found." + fi diff --git a/media-video/handbrake/handbrake-1.3.0-r1.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild similarity index 97% rename from media-video/handbrake/handbrake-1.3.0-r1.ebuild rename to media-video/handbrake/handbrake-1.3.0-r2.ebuild index ddd53059745..21bb95bbbdb 100644 --- a/media-video/handbrake/handbrake-1.3.0-r1.ebuild +++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild @@ -90,11 +90,10 @@ PATCHES=( # Fix missing flags "${FILESDIR}/${P}-missing-linker-flags.patch" -) -pkg_setup() { - python-any-r1_pkg_setup -} + # Use whichever python is set by portage + "${FILESDIR}/${P}-dont-search-for-python.patch" +) src_prepare() { # Get rid of leftover bundled library build definitions,