From f7845a2ca8338f6120f49b182849e1252683c9e1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sun, 25 Nov 2018 12:09:50 +0000
Subject: app-misc/golly: add missing wxgtk[opengl] depend, bug #611724
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

golly requires opengl from wxgtk unconditionally.

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/611724
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 app-misc/golly/golly-2.8-r1.ebuild | 58 ++++++++++++++++++++++++++++++++++++++
 app-misc/golly/golly-2.8.ebuild    | 58 --------------------------------------
 2 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 app-misc/golly/golly-2.8-r1.ebuild
 delete mode 100644 app-misc/golly/golly-2.8.ebuild

(limited to 'app-misc')

diff --git a/app-misc/golly/golly-2.8-r1.ebuild b/app-misc/golly/golly-2.8-r1.ebuild
new file mode 100644
index 000000000000..0dda2847e7e9
--- /dev/null
+++ b/app-misc/golly/golly-2.8-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-lang/perl
+	virtual/opengl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P}-src
+ECONF_SOURCE=gui-wx/configure
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_configure() {
+	append-libs -lGL -ldl
+	econf \
+		--with-perl-shlib="libperl.so" \
+		--with-wxshared
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc docs/ReadMe.html
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/golly/golly-2.8.ebuild b/app-misc/golly/golly-2.8.ebuild
deleted file mode 100644
index 1c6a36ee52e7..000000000000
--- a/app-misc/golly/golly-2.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-lang/perl
-	virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-ECONF_SOURCE=gui-wx/configure
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_configure() {
-	append-libs -lGL -ldl
-	econf \
-		--with-perl-shlib="libperl.so" \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-- 
cgit v1.2.3-18-g5258