From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1182698-garchives=archives.gentoo.org@lists.gentoo.org>
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 712F41382C5
for <garchives@archives.gentoo.org>; Sat, 27 Jun 2020 08:54:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 41A6EE0A63;
Sat, 27 Jun 2020 08:54:10 +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 B2726E0A63
for <gentoo-commits@lists.gentoo.org>; Sat, 27 Jun 2020 08:54: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 5C2A134EEDA
for <gentoo-commits@lists.gentoo.org>; Sat, 27 Jun 2020 08:54:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C89102A5
for <gentoo-commits@lists.gentoo.org>; Sat, 27 Jun 2020 08:54:06 +0000 (UTC)
From: "Sergei Trofimovich" <slyfox@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, "Sergei Trofimovich" <slyfox@gentoo.org>
Message-ID: <1593248043.e4e5a0e92cd78ec92b5cbba2b32cb2a0c793551b.slyfox@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/golly/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-misc/golly/golly-3.3-r1.ebuild
X-VCS-Directories: app-misc/golly/
X-VCS-Committer: slyfox
X-VCS-Committer-Name: Sergei Trofimovich
X-VCS-Revision: e4e5a0e92cd78ec92b5cbba2b32cb2a0c793551b
X-VCS-Branch: master
Date: Sat, 27 Jun 2020 08:54:06 +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: 6e060ed8-5b91-43b4-9be4-2dc1fa7abe1e
X-Archives-Hash: f9a7245cff3365e98232aa1feb54a8a6
commit: e4e5a0e92cd78ec92b5cbba2b32cb2a0c793551b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 27 08:52:30 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 08:54:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e5a0e9
app-misc/golly: revet "drop optional python2 scripting support"
Restore python-2 support until we add python-3.
This reverts commit b5cdd754b8c4c528a258db72069f0dd0eea0f7c7.
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-misc/golly/golly-3.3-r1.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/app-misc/golly/golly-3.3-r1.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
index 27ee1bae14e..26742c324c9 100644
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -4,8 +4,9 @@
EAPI=7
WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
-inherit desktop eutils flag-o-matic wxwidgets xdg-utils
+inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
HOMEPAGE="http://golly.sourceforge.net/"
@@ -15,11 +16,13 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="virtual/opengl
sys-libs/zlib
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ ${PYTHON_DEPS}"
S=${WORKDIR}/${P}-src