From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1538711-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 186B215800A
for <garchives@archives.gentoo.org>; Wed, 19 Jul 2023 08:28:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5B9D4E079C;
Wed, 19 Jul 2023 08:28:33 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 42A49E077F
for <gentoo-commits@lists.gentoo.org>; Wed, 19 Jul 2023 08:28:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 43E52340D2E
for <gentoo-commits@lists.gentoo.org>; Wed, 19 Jul 2023 08:28:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6549169
for <gentoo-commits@lists.gentoo.org>; Wed, 19 Jul 2023 08:28:30 +0000 (UTC)
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" <pacho@gentoo.org>
Message-ID: <1689755285.5e4cabe39a1ad71a44b89b696142bab6226291a4.pacho@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/pymol/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-chemistry/pymol/pymol-2.5.0-r3.ebuild
X-VCS-Directories: sci-chemistry/pymol/
X-VCS-Committer: pacho
X-VCS-Committer-Name: Pacho Ramos
X-VCS-Revision: 5e4cabe39a1ad71a44b89b696142bab6226291a4
X-VCS-Branch: master
Date: Wed, 19 Jul 2023 08:28:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b237e812-4c37-4ac3-bf5e-1bf3b2058dd4
X-Archives-Hash: 903ad28025c9a79026d1669db30b0f3d
commit: 5e4cabe39a1ad71a44b89b696142bab6226291a4
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 08:26:10 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 08:28:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e4cabe3
sci-chemistry/pymol: Fix distutils-r1 usage
Thanks-to: Sam James
Closes: https://bugs.gentoo.org/851588
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
sci-chemistry/pymol/pymol-2.5.0-r3.ebuild | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/sci-chemistry/pymol/pymol-2.5.0-r3.ebuild b/sci-chemistry/pymol/pymol-2.5.0-r3.ebuild
index 92415ecd58a6..ae7eda57d7a6 100644
--- a/sci-chemistry/pymol/pymol-2.5.0-r3.ebuild
+++ b/sci-chemistry/pymol/pymol-2.5.0-r3.ebuild
@@ -5,6 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_EXT=1
inherit desktop flag-o-matic xdg distutils-r1
@@ -56,24 +57,25 @@ python_prepare_all() {
append-cxxflags -std=c++0x
- use !netcdf && mydistutilsargs=( --no-vmd-plugins )
-
distutils-r1_python_prepare_all
}
+python_configure_all() {
+ use !netcdf && DISTUTILS_ARGS=( --no-vmd-plugins )
+}
+
python_install() {
distutils-r1_python_install \
--pymol-path="${EPREFIX}/usr/share/pymol"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
sed \
-e '1i#!/usr/bin/env python' \
"${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die
+ python_doscript "${T}"/${PN}
+}
- python_foreach_impl python_doscript "${T}"/${PN}
+python_install_all() {
+ distutils-r1_python_install_all
# These environment variables should not go in the wrapper script, or else
# it will be impossible to use the PyMOL libraries from Python.