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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C61115808B for ; Sat, 19 Mar 2022 14:02:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD339E0966; Sat, 19 Mar 2022 14:02:54 +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 B5E2FE0966 for ; Sat, 19 Mar 2022 14:02:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A724C343157 for ; Sat, 19 Mar 2022 14:02:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B91631A for ; Sat, 19 Mar 2022 14:02:52 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1647698560.7f4c2c8909f0516d49c4e4e0c530f8382cc2e272.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/rospkg/rospkg-9999.ebuild X-VCS-Directories: dev-python/rospkg/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 7f4c2c8909f0516d49c4e4e0c530f8382cc2e272 X-VCS-Branch: master Date: Sat, 19 Mar 2022 14:02:52 +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: 731c5324-c925-4e78-a6f4-cf26c0015c3d X-Archives-Hash: d1f33760c4c4949159630964c6544c69 commit: 7f4c2c8909f0516d49c4e4e0c530f8382cc2e272 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 19 07:11:41 2022 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 19 14:02:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4c2c89 dev-python/rospkg: update live ebuild Signed-off-by: Arthur Zamarin gentoo.org> dev-python/rospkg/rospkg-9999.ebuild | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild index fbd4db374f38..430b4a135478 100644 --- a/dev-python/rospkg/rospkg-9999.ebuild +++ b/dev-python/rospkg/rospkg-9999.ebuild @@ -1,23 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{8..10} ) - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg" -fi - -inherit ${SCM} distutils-r1 +inherit distutils-r1 DESCRIPTION="Standalone Python library for the ROS package system" HOMEPAGE="https://wiki.ros.org/rospkg" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" - # Needed for tests + +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg" + inherit git-r3 + S="${WORKDIR}/${PN}" EGIT_CHECKOUT_DIR="${S}" else @@ -28,7 +24,8 @@ fi LICENSE="BSD" SLOT="0" -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}] +RDEPEND=" + dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] " @@ -37,6 +34,8 @@ BDEPEND=" dev-python/mock[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" ) +PATCHES=( + "${FILESDIR}/gentoo.patch" +) -distutils_enable_tests nose +distutils_enable_tests pytest