6 files changed, 177 insertions, 6 deletions
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 12fab431020d..f42c5a1ea82d 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,5 +1,9 @@
+AUX golly-3.2-mouse-1.patch 2506 BLAKE2B c406ac060601a4bed6351a0ed23ffafcc46bcd08a76da6487054afb5491c4d3a6fb514a252a7bc2161797e50d868d10a98e5fefb2ed9632a9682f747c1d3252d SHA512 e567198dbf7fba0b5edfd174b1566e180c2ad81129fc0336d381dfa7bbe2870816b98bb02d5ac61dc174aca12a1f03e79bd1f8023ccab4db4b3f73c29ccc9a6c
+AUX golly-3.2-mouse-2.patch 1553 BLAKE2B 34e8a85532ca7176fa4f587438662b760a72d97489d37c69150cd3b9467c7a4d06571754013a70aa95cfce56dc8e385608911b21c163b10c3304281164360b50 SHA512 34b96fd4d7f0aa004bad14a5eb872a55386b2765d7b29d497ca5ed8fe5f3404996b58a372a34ec8f988f6178d15ca1c45d15d94145238230408813261284c5f4
 DIST golly-2.7-src.tar.gz 3881882 BLAKE2B 1989ff56049b7a182cbca35e33ac287c279ebac69acc5d07ac5122e8ccffef978a2e063c0587813d177a6311c854c6d52c2e80a5919107f9c6b17947a5e5f1ab SHA512 084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77
 DIST golly-2.8-src.tar.gz 4087191 BLAKE2B 4029b9bd30624cf2253dc5524c998f7e50648d39bc8dccf23b5c6b586989a641dde17b9fe35f16043d0f0d4a60da46729b31a9715b5d07950d610ea41a93a7a5 SHA512 bd86f685d180687814a44aa51edf4952a5af9024abb76d6b30faf1229edc86a1ba4e1f2c13f249f604d483fbde1a6db05150263450935b5bb073c155ad166a53
+DIST golly-3.2-src.tar.gz 5261483 BLAKE2B c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235 SHA512 bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
 EBUILD golly-2.7-r1.ebuild 1016 BLAKE2B f4d11a14b186a071c7c4e3d22fed0f86ba01b60cf05594e5fa5d36b92efbdb88791130cca30b5b53509357521cac6c8e38714e6ce7eb29892dacf23d948abcc0 SHA512 28c118e5bd8542699bd89517e301a169dcb0961920fe66958329bf4570c3e6a53446069850d24553ac6f9ab69b99445a51888281edcb34d83a54f79497428216
-EBUILD golly-2.8.ebuild 1128 BLAKE2B d5c9c5cb9b3d06720ba88a80026b04dd7a9ba46bff7aea77b394e99fa25d541aaf70ed3319ad1b83ca624b901ffe943f104407a0037d5385e63a6bfa45067e90 SHA512 fb2accd032fc55513a560f8a18fed679520128a38bf025e0d85616fe44e55f58e2d3d1bd993fbcccf5db99a98fd13ae33d1c6f60ed34ee95b19924ea4e6aa06d
-MISC metadata.xml 318 BLAKE2B 3521aab878976d7d846949477eb917c04e1c4cf04667b950e2b6e16ffa7dbae647a02a95759ed9069a763bcf6e059dc494f0e848574856177c2f71c5c8b32ce1 SHA512 38f971db2a96d7d2b20a3151b3000c01b0fbe4dac6ec537ff0fe662d50311afbaa42090edc5a91387ea83616d1b143ed104e9596d807b34799acceabd9c2c71f
+EBUILD golly-2.8-r1.ebuild 1132 BLAKE2B d7e03271c35d155f163fa54f2c0264cd4ad651248cd80f64b93ab832f2e647371134783ff77f543d80b8dabf3e05aab781777051e13ebe625370df3a5290efb3 SHA512 3f162769d8940a0eed7d227fca60675fc430ee285beae0c5f6dfb19c94414f4eec61f758b506c107ca79f45981bdbfdfc7ee51889c7e8859c0307f451ef4035f
+EBUILD golly-3.2.ebuild 1150 BLAKE2B 353b5ed9260c8b8b594cf3fa4804b62eb3207aafa90d71892b240ab658d9adc625cba8e5b9e80cc484d349d1d8644ef2da67075b530f5eeefa72f4fffee04fb4 SHA512 560377816c32ced370653be76cba7c18855803e348733e94476ca0ee367af62412ac4021d6a583b7576f93486171cbd6ef3c4b43076745210a071281dd185a72
+MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/files/golly-3.2-mouse-1.patch b/app-misc/golly/files/golly-3.2-mouse-1.patch
new file mode 100644
index 000000000000..ab4fc703f507
--- /dev/null
+++ b/app-misc/golly/files/golly-3.2-mouse-1.patch
@@ -0,0 +1,63 @@
+From e22d1534d486a7b46612ca6f6cd693b8fa4635d2 Mon Sep 17 00:00:00 2001
+From: Chris Rowett <rowett@yahoo.com>
+Date: Tue, 10 Jul 2018 23:22:20 +0100
+Subject: [PATCH] bugfix: do not process other mouse buttons until current
+ button released
+
+---
+ gui-wx/wxview.cpp | 15 +++++++++++++++
+ gui-wx/wxview.h   |  2 ++
+ 2 files changed, 17 insertions(+)
+
+--- a/gui-wx/wxview.cpp
++++ b/gui-wx/wxview.cpp
+@@ -2801,6 +2801,13 @@ void PatternView::OnMouseDown(wxMouseEvent& event)
+     int button = event.GetButton();
+     int modifiers = GetMouseModifiers(event);
+     
++    // ignore if a mouse button is already down
++    if (mouseisdown) return;
++
++    // flag that a mouse button is down
++    mouseisdown = true;
++    whichbuttondown = button;
++
+     if (waitingforclick && button == wxMOUSE_BTN_LEFT) {
+         // save paste location
+         pastex = x;
+@@ -2870,6 +2877,13 @@ void PatternView::OnMouseDown(wxMouseEvent& event)
+ 
+ void PatternView::OnMouseUp(wxMouseEvent& event)
+ {
++    // if the button released was not the first held down then ignore
++    int button = event.GetButton();
++    if (button != whichbuttondown) return;
++
++    // same button released so process
++    mouseisdown = false;
++
+     if (drawingcells || selectingcells || movingview || clickedcontrol > NO_CONTROL) {
+         StopDraggingMouse();
+     } else if (mainptr->draw_pending) {
+@@ -3273,6 +3287,7 @@ PatternView::PatternView(wxWindow* parent, wxCoord x, wxCoord y, int wd, int ht,
+     selectingcells = false;    // not selecting cells
+     movingview = false;        // not moving view
+     waitingforclick = false;   // not waiting for user to click
++    mouseisdown = false;       // mouse button is not down
+     nopattupdate = false;      // enable pattern updates
+     showcontrols = false;      // not showing translucent controls
+     oldcursor = NULL;          // for toggling cursor via shift key
+--- a/gui-wx/wxview.h
++++ b/gui-wx/wxview.h
+@@ -102,6 +102,8 @@ public:
+     bool movingview;              // moving view due to dragging mouse?
+     bool nopattupdate;            // disable pattern updates?
+     bool showcontrols;            // draw translucent controls?
++    bool mouseisdown;             // mouse button held down?
++    int whichbuttondown;          // which mouse button is down
+     wxRect controlsrect;          // location of translucent controls
+     wxRect pasterect;             // area to be pasted
+     wxCursor* oldcursor;          // non-NULL if shift key has toggled cursor
+-- 
+2.19.2
+
diff --git a/app-misc/golly/files/golly-3.2-mouse-2.patch b/app-misc/golly/files/golly-3.2-mouse-2.patch
new file mode 100644
index 000000000000..b2655ba6212b
--- /dev/null
+++ b/app-misc/golly/files/golly-3.2-mouse-2.patch
@@ -0,0 +1,45 @@
+From 746f5f6f0c29867ac97516d00fdf58d3496a6687 Mon Sep 17 00:00:00 2001
+From: Chris Rowett <rowett@yahoo.com>
+Date: Wed, 11 Jul 2018 12:44:22 +0100
+Subject: [PATCH] bugfix: clear mousedown flag in mousecapturelost event
+ handler
+
+---
+ gui-wx/wxview.cpp | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+--- a/gui-wx/wxview.cpp
++++ b/gui-wx/wxview.cpp
+@@ -81,9 +81,7 @@ EVT_MIDDLE_DCLICK    (           PatternView::OnMouseDown)
+ EVT_LEFT_UP          (           PatternView::OnMouseUp)
+ EVT_RIGHT_UP         (           PatternView::OnMouseUp)
+ EVT_MIDDLE_UP        (           PatternView::OnMouseUp)
+-#if wxCHECK_VERSION(2, 8, 0)
+ EVT_MOUSE_CAPTURE_LOST (         PatternView::OnMouseCaptureLost)
+-#endif
+ EVT_MOTION           (           PatternView::OnMouseMotion)
+ EVT_ENTER_WINDOW     (           PatternView::OnMouseEnter)
+ EVT_LEAVE_WINDOW     (           PatternView::OnMouseExit)
+@@ -2901,18 +2899,15 @@ void PatternView::OnMouseUp(wxMouseEvent& event)
+ 
+ // -----------------------------------------------------------------------------
+ 
+-#if wxCHECK_VERSION(2, 8, 0)
+-
+ // mouse capture can be lost on Windows before mouse-up event
+ void PatternView::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+ {
++    mouseisdown = false;
+     if (drawingcells || selectingcells || movingview || clickedcontrol > NO_CONTROL) {
+         StopDraggingMouse();
+     }
+ }
+ 
+-#endif
+-
+ // -----------------------------------------------------------------------------
+ 
+ void PatternView::OnMouseMotion(wxMouseEvent& event)
+-- 
+2.19.2
+
diff --git a/app-misc/golly/golly-2.8.ebuild b/app-misc/golly/golly-2.8-r1.ebuild
index 1c6a36ee52e7..0dda2847e7e9 100644
--- a/app-misc/golly/golly-2.8.ebuild
+++ b/app-misc/golly/golly-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="dev-lang/perl
 	virtual/opengl
 	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]"
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}"
 
diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
new file mode 100644
index 000000000000..6000a64174e4
--- /dev/null
+++ b/app-misc/golly/golly-3.2.ebuild
@@ -0,0 +1,59 @@
+# 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="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="virtual/opengl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mouse-1.patch
+	"${FILESDIR}"/${P}-mouse-2.patch
+)
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_configure() {
+	ECONF_SOURCE=gui-wx/configure econf \
+		--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/metadata.xml b/app-misc/golly/metadata.xml
index f40f0dd4325f..5f6d283dd742 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">golly</remote-id>