| 1 |
commit: e4e5a0e92cd78ec92b5cbba2b32cb2a0c793551b |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 27 08:52:30 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 27 08:54:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e5a0e9 |
| 7 |
|
| 8 |
app-misc/golly: revet "drop optional python2 scripting support" |
| 9 |
|
| 10 |
Restore python-2 support until we add python-3. |
| 11 |
|
| 12 |
This reverts commit b5cdd754b8c4c528a258db72069f0dd0eea0f7c7. |
| 13 |
|
| 14 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 15 |
|
| 16 |
app-misc/golly/golly-3.3-r1.ebuild | 7 +++++-- |
| 17 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-misc/golly/golly-3.3-r1.ebuild b/app-misc/golly/golly-3.3-r1.ebuild |
| 20 |
index 27ee1bae14e..26742c324c9 100644 |
| 21 |
--- a/app-misc/golly/golly-3.3-r1.ebuild |
| 22 |
+++ b/app-misc/golly/golly-3.3-r1.ebuild |
| 23 |
@@ -4,8 +4,9 @@ |
| 24 |
EAPI=7 |
| 25 |
|
| 26 |
WX_GTK_VER=3.0 |
| 27 |
+PYTHON_COMPAT=( python2_7 ) |
| 28 |
|
| 29 |
-inherit desktop eutils flag-o-matic wxwidgets xdg-utils |
| 30 |
+inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils |
| 31 |
|
| 32 |
DESCRIPTION="simulator for Conway's Game of Life and other cellular automata" |
| 33 |
HOMEPAGE="http://golly.sourceforge.net/" |
| 34 |
@@ -15,11 +16,13 @@ LICENSE="GPL-2" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="amd64 x86" |
| 37 |
IUSE="tiff" |
| 38 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 39 |
|
| 40 |
DEPEND="virtual/opengl |
| 41 |
sys-libs/zlib |
| 42 |
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]" |
| 43 |
-RDEPEND="${DEPEND}" |
| 44 |
+RDEPEND="${DEPEND} |
| 45 |
+ ${PYTHON_DEPS}" |
| 46 |
|
| 47 |
S=${WORKDIR}/${P}-src |
Archives