gentoo Easter resync : 12.04.2020

5 files changed, 0 insertions, 223 deletions

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index a9d2c0be9027..4365de15ed13 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,8 +1,3 @@
-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-3.2-src.tar.gz 5261483 BLAKE2B c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235 SHA512 bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
-EBUILD golly-3.2.ebuild 1148 BLAKE2B a753b5b303d6d59ea2cb9f596367c473896328947b64214cecb53d59082292c9f38e553127142b25ca6e0f52ab379f25a52ccd95d54c258ccdbe6a831877f4ac SHA512 5192b0c80ea964422fb49e607af8e0ac68a8dced02182a38cea1c0fea5583a07784ff8ffc6f47f56c5b9f41d217717e9dab776920c1872b0b137f8c3fb07bc43
 EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
-EBUILD golly-3.3.ebuild 1028 BLAKE2B 28d361d337836b78321ee373eb8b6b08b6bfa387c1af6cf5cabddce7fee0f82960a013bf38d8d98c3c7e0c20ca98a1287024ed71357f44d3d0e7becc45420366 SHA512 7106647455ff3b6a2754ddda2c07aee65a129d7021a4e22f9c9561ca10301836967e3840b9181ddeb2bdeeaf4cb910e4ba9c2181e5f1b75bda216a60fa5398df
 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
deleted file mode 100644
index ab4fc703f507..000000000000
--- a/app-misc/golly/files/golly-3.2-mouse-1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index b2655ba6212b..000000000000
--- a/app-misc/golly/files/golly-3.2-mouse-2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
deleted file mode 100644
index 733fce4ccb93..000000000000
--- a/app-misc/golly/golly-3.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 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/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
deleted file mode 100644
index dffedc97b55a..000000000000
--- a/app-misc/golly/golly-3.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-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/"
-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
-
-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_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}