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 12233138335 for ; Tue, 9 Apr 2019 15:44:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8DB9E08BF; Tue, 9 Apr 2019 15:44:09 +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 BBAEDE08BF for ; Tue, 9 Apr 2019 15:44:09 +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 F23EC335D01 for ; Tue, 9 Apr 2019 15:44:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0025B549 for ; Tue, 9 Apr 2019 15:44:05 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1554824558.c8e78899ede4fc19cef475e9043b55afd844778f.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/xdot/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/xdot/xdot-9999.ebuild X-VCS-Directories: media-gfx/xdot/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c8e78899ede4fc19cef475e9043b55afd844778f X-VCS-Branch: master Date: Tue, 9 Apr 2019 15:44:05 +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: 7883b7af-0673-4137-94ab-b37fd6d204f2 X-Archives-Hash: 78025770ac86762548192c765f94a1ce commit: c8e78899ede4fc19cef475e9043b55afd844778f Author: Matt Turner gentoo org> AuthorDate: Tue Apr 9 15:35:18 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Apr 9 15:42:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e78899 media-gfx/xdot: Rework live ebuild Signed-off-by: Matt Turner gentoo.org> media-gfx/xdot/xdot-9999.ebuild | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild index 6b682956a73..8842ac3a99a 100644 --- a/media-gfx/xdot/xdot-9999.ebuild +++ b/media-gfx/xdot/xdot-9999.ebuild @@ -1,23 +1,47 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) -inherit distutils-r1 git-r3 +MY_PN=xdot.py +EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" + SRC_URI="" +else + KEYWORDS="~amd64 ~x86" + MY_P="${MY_PN}-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +inherit ${GIT_ECLASS} distutils-r1 DESCRIPTION="Interactive viewer for Graphviz dot files" HOMEPAGE="https://github.com/jrfonseca/xdot.py" -EGIT_REPO_URI="https://github.com/jrfonseca/xdot.py.git" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="" DEPEND=" dev-python/pycairo[${PYTHON_USEDEP}] - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] - media-gfx/graphviz[${PYTHON_USEDEP}] + media-gfx/graphviz " RDEPEND="${DEPEND}" + +src_unpack() { + default + [[ $PV = 9999* ]] && git-r3_src_unpack +} + +src_prepare() { + eapply_user + + # Don't require graphviz python(2) supprt, which xdot doesn't use. This allows xdot to support python3. + # For more info, see https://bugs.gentoo.org/643126 + sed -i "/install_requires=\['graphviz'\],/d" setup.py || die +}