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 B45521382C5 for ; Mon, 29 Jun 2020 12:33:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE487E08C9; Mon, 29 Jun 2020 12:33:24 +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 867B0E08C9 for ; Mon, 29 Jun 2020 12:33:24 +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 2670B34F16A for ; Mon, 29 Jun 2020 12:33:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 775D62BF for ; Mon, 29 Jun 2020 12:33:20 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1593433979.3f3a3b7a6eaa92dc3e3d7c38eda42b976d9bcb22.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/nsscache/nsscache-0.39.ebuild X-VCS-Directories: net-nds/nsscache/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3f3a3b7a6eaa92dc3e3d7c38eda42b976d9bcb22 X-VCS-Branch: master Date: Mon, 29 Jun 2020 12:33:20 +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: 3478bf58-28e1-4c02-b66c-51a3f608bc28 X-Archives-Hash: 8fc6f397127b9646a9b54c8c26fc849a commit: 3f3a3b7a6eaa92dc3e3d7c38eda42b976d9bcb22 Author: David Seifert gentoo org> AuthorDate: Mon Jun 29 12:32:59 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Jun 29 12:32:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3a3b7a net-nds/nsscache: [QA] Fix various python issues Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: David Seifert gentoo.org> net-nds/nsscache/nsscache-0.39.ebuild | 45 ++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/net-nds/nsscache/nsscache-0.39.ebuild b/net-nds/nsscache/nsscache-0.39.ebuild index f615656a1ee..f50a61c5cd8 100644 --- a/net-nds/nsscache/nsscache-0.39.ebuild +++ b/net-nds/nsscache/nsscache-0.39.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + PYTHON_COMPAT=( python3_{6,7,8} ) -inherit eutils distutils-r1 +inherit distutils-r1 DESCRIPTION="commandline tool to sync directory services to local cache" HOMEPAGE="https://github.com/google/nsscache" @@ -16,44 +17,50 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" IUSE="nsscache s3" +RESTRICT="test" # requires network -DEPEND="${PYTHON_DEPS} - dev-python/ldap3[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/bsddb3[${PYTHON_USEDEP}] - s3? ( dev-python/boto3[${PYTHON_USEDEP}] )" +DEPEND=" + dev-python/ldap3[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/bsddb3[${PYTHON_USEDEP}] + s3? ( dev-python/boto3[${PYTHON_USEDEP}] )" RDEPEND="${DEPEND} - nsscache? ( >=sys-auth/libnss-cache-0.10 )" -RESTRICT="test" # requires network + nsscache? ( >=sys-auth/libnss-cache-0.10 )" + S="${WORKDIR}/${PN}-version-${PV}" -src_prepare() { +python_prepare_all() { sed -i \ -e "/setup_requires/s,'pytest-runner',,g" \ -e '/tests_require/s,\[.*\],[],g' \ - "${S}"/setup.py || die + setup.py || die sed -i \ -e '/test=pytest/d' \ - "${S}"/setup.cfg || die + setup.cfg || die sed -i \ -e '/pytest/d' \ - "${S}"/requirements.txt || die - distutils-r1_src_prepare + requirements.txt || die + + distutils-r1_python_prepare_all } python_compile() { distutils-r1_python_compile --verbose } -src_install() { - distutils-r1_src_install +python_install() { + distutils-r1_python_install + + python_scriptinto /usr/libexec/nsscache + python_newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py +} + +python_install_all() { + distutils-r1_python_install_all doman nsscache.1 nsscache.conf.5 dodoc THANKS nsscache.cron CONTRIBUTING.md README.md - exeinto /usr/libexec/nsscache - newexe "${DISTDIR}"/"${SCRIPT_A}" authorized-keys-command.py keepdir /var/lib/nsscache }