subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-misc\/golly\/"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2024-05-25 Thread Maciej Barć

commit: 459401a2115ebf4c7429196c3c5e4fef67c0b1ef
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat May 25 13:33:38 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat May 25 14:05:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=459401a2

app-misc/golly: bump to 4.3

Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/Manifest |  1 +
 app-misc/golly/golly-4.3.ebuild | 72 +
 2 files changed, 73 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 459f6dca7ea7..062bb1ad78b3 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1 +1,2 @@
 DIST golly-4.2-src.tar.gz 15348982 BLAKE2B 
21ebed4c282a77a3f61aafa98936c0bb39b39a7c97505e96fc43ac720bd2eea4cf20996ca28c801f79a46577a0cf99ff60614ce134081605d14ca5972c841d50
 SHA512 
b9f5cfdfe9b96590411695805dd8b875329c81027fef98dff3f16b832018be2ad3a06583bb64e12fb305268feba2347ef63c4586ff0e645721a8085f04ab382a
+DIST golly-4.3-src.tar.gz 15488205 BLAKE2B 
0789bc3e50f43083633f699c5e4ff20fd314cfa776d22463dce3169095e57daeadda4d9671f1b566d6786771caf029f98e4593b250cf29a73abff0c200e2f32b
 SHA512 
daf3a0ef8b7d3f97df2c3a05a245c93eb124ebab4e7a7c0d267e22b4b7271a11cecced20b53fa88dfde145ce11450aac98e0e774f8b6419b3084952938e5a854

diff --git a/app-misc/golly/golly-4.3.ebuild b/app-misc/golly/golly-4.3.ebuild
new file mode 100644
index ..24219cbdfaf1
--- /dev/null
+++ b/app-misc/golly/golly-4.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER=3.2-gtk3
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/
+   https://sourceforge.net/projects/golly/;
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz;
+S="${WORKDIR}/${P}-src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   sys-libs/zlib
+   virtual/opengl
+   x11-libs/wxGTK:${WX_GTK_VER}[X,curl,opengl,sdl,tiff]
+   ${PYTHON_DEPS}
+"
+DEPEND="
+   ${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0-CFLAGS.patch" )
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   setup-wxwidgets
+}
+
+src_compile() {
+   local -a mymakeopts=(
+   ENABLE_SOUND=yes
+   GOLLYDIR="${EPREFIX}/usr/share/${PN}"
+   PYTHON=${EPYTHON}
+   WX_CONFIG=${WX_CONFIG}
+   AR="$(tc-getAR)"
+   CC="$(tc-getCC)"
+   CXX="$(tc-getCXX)"
+   CXXC="$(tc-getCXX)"
+   RANLIB="$(tc-getRANLIB)"
+   )
+   emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}"
+}
+
+src_install() {
+   # Has no 'make install', let's install files manually.
+   exeinto /usr/bin
+   doexe golly bgolly
+
+   insinto "/usr/share/${PN}"
+   doins -r Help Patterns Scripts Rules docs
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2024-04-14 Thread Maciej Barć

commit: 21df94fa092d1be6344a53e98726876f71feb1b1
Author: Maciej Barć  gentoo  org>
AuthorDate: Sun Apr 14 15:03:02 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sun Apr 14 15:33:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21df94fa

app-misc/golly: enable py3.12 compat

Closes: https://bugs.gentoo.org/929331
Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/{golly-4.2.ebuild => golly-4.2-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/golly/golly-4.2.ebuild 
b/app-misc/golly/golly-4.2-r1.ebuild
similarity index 95%
rename from app-misc/golly/golly-4.2.ebuild
rename to app-misc/golly/golly-4.2-r1.ebuild
index a35f1c8f3a23..c7e51fab9793 100644
--- a/app-misc/golly/golly-4.2.ebuild
+++ b/app-misc/golly/golly-4.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 WX_GTK_VER=3.2-gtk3
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2023-09-02 Thread Maciej Barć

commit: c56ceb930ee7e6171b2d64bbf6dd770511c68dd4
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat Sep  2 14:14:39 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat Sep  2 14:29:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56ceb93

app-misc/golly: drop old 4.1-r1

Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/Manifest|  1 -
 app-misc/golly/golly-4.1-r1.ebuild | 67 --
 2 files changed, 68 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 6bf37af5d5cc..459f6dca7ea7 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
-DIST golly-4.1-src.tar.gz 14877727 BLAKE2B 
d9cac1250901a39d6a360b527c6f4872fc78d0426ea255b9f9129136b938a6655ff59f8c5b0204fd44f4ac0ae76e307c763ddb24a1d8a00bd4e548e4ac2277c3
 SHA512 
bc050a216a36091f0df42e61a19c34353c6306dc1ae86c194693c85a4489b118435da238b25017bde4b3d31a79e12a6988f7b7da5ae90cfcc9ca0795e66d4a99
 DIST golly-4.2-src.tar.gz 15348982 BLAKE2B 
21ebed4c282a77a3f61aafa98936c0bb39b39a7c97505e96fc43ac720bd2eea4cf20996ca28c801f79a46577a0cf99ff60614ce134081605d14ca5972c841d50
 SHA512 
b9f5cfdfe9b96590411695805dd8b875329c81027fef98dff3f16b832018be2ad3a06583bb64e12fb305268feba2347ef63c4586ff0e645721a8085f04ab382a

diff --git a/app-misc/golly/golly-4.1-r1.ebuild 
b/app-misc/golly/golly-4.1-r1.ebuild
deleted file mode 100644
index 3a22aa296ccd..
--- a/app-misc/golly/golly-4.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
-
-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"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   sys-libs/zlib
-   virtual/opengl
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,sdl,tiff]
-   ${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.0-CFLAGS.patch )
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   setup-wxwidgets
-}
-
-src_compile() {
-   local mymakeopts=(
-   ENABLE_SOUND=yes
-   GOLLYDIR="${EPREFIX}/usr/share/${PN}"
-   PYTHON=${EPYTHON}
-   WX_CONFIG=${WX_CONFIG}
-   AR="$(tc-getAR)"
-   CC="$(tc-getCC)"
-   CXX="$(tc-getCXX)"
-   CXXC="$(tc-getCXX)"
-   RANLIB="$(tc-getRANLIB)"
-   )
-   emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}"
-}
-
-src_install() {
-   # has no 'make install' Let's install files manually.
-   dobin golly bgolly
-   insinto /usr/share/${PN}
-   doins -r Help Patterns Scripts Rules docs
-
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2023-05-05 Thread Maciej Barć

commit: 111cae1b75a5718df053b312666fccee77db6170
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri May  5 10:49:20 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri May  5 12:03:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111cae1b

app-misc/golly: drop old 4.0

Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/Manifest |  1 -
 app-misc/golly/golly-4.0.ebuild | 72 -
 2 files changed, 73 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 8534b248b213..6bf37af5d5cc 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,3 +1,2 @@
-DIST golly-4.0-src.tar.gz 5579026 BLAKE2B 
fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32
 SHA512 
3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
 DIST golly-4.1-src.tar.gz 14877727 BLAKE2B 
d9cac1250901a39d6a360b527c6f4872fc78d0426ea255b9f9129136b938a6655ff59f8c5b0204fd44f4ac0ae76e307c763ddb24a1d8a00bd4e548e4ac2277c3
 SHA512 
bc050a216a36091f0df42e61a19c34353c6306dc1ae86c194693c85a4489b118435da238b25017bde4b3d31a79e12a6988f7b7da5ae90cfcc9ca0795e66d4a99
 DIST golly-4.2-src.tar.gz 15348982 BLAKE2B 
21ebed4c282a77a3f61aafa98936c0bb39b39a7c97505e96fc43ac720bd2eea4cf20996ca28c801f79a46577a0cf99ff60614ce134081605d14ca5972c841d50
 SHA512 
b9f5cfdfe9b96590411695805dd8b875329c81027fef98dff3f16b832018be2ad3a06583bb64e12fb305268feba2347ef63c4586ff0e645721a8085f04ab382a

diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
deleted file mode 100644
index 7737a0ebc8e2..
--- a/app-misc/golly/golly-4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit desktop python-single-r1 toolchain-funcs 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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
-   sys-libs/zlib
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff]
-   ${PYTHON_DEPS}
-"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.0-CFLAGS.patch
-)
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   setup-wxwidgets
-}
-
-src_compile() {
-   emake -C gui-wx -f makefile-gtk \
-   \
-   CC="$(tc-getCC)" \
-   CXX="$(tc-getCXX)" \
-   CXXC="$(tc-getCXX)" \
-   \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   \
-   PYTHON=${EPYTHON} \
-   WX_CONFIG=${WX_CONFIG} \
-   \
-   GOLLYDIR="${EPREFIX}/usr/share/${PN}"
-}
-
-src_install() {
-   # has no 'make install' Let's install files manually.
-   dobin golly bgolly
-   insinto /usr/share/${PN}
-   doins -r Help Patterns Scripts Rules docs
-
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2023-05-01 Thread Arthur Zamarin

commit: 181bbb30d16e1766546fcd2a01fd68ee7ac35bad
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May  1 07:26:27 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May  1 07:26:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181bbb30

app-misc/golly: Stabilize 4.2 x86, #898180

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-misc/golly/golly-4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-4.2.ebuild b/app-misc/golly/golly-4.2.ebuild
index dcdfaa3151b8..a35f1c8f3a23 100644
--- a/app-misc/golly/golly-4.2.ebuild
+++ b/app-misc/golly/golly-4.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2023-04-30 Thread Sam James

commit: 5cfbae552641143b9b50fab7297160e93c2e3c4b
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 01:50:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 01:50:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cfbae55

app-misc/golly: Stabilize 4.2 amd64, #898180

Signed-off-by: Sam James  gentoo.org>

 app-misc/golly/golly-4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-4.2.ebuild b/app-misc/golly/golly-4.2.ebuild
index 2cdfc69578d6..dcdfaa3151b8 100644
--- a/app-misc/golly/golly-4.2.ebuild
+++ b/app-misc/golly/golly-4.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2023-01-20 Thread Maciej Barć

commit: f56162f0f8f14ae7d8f6db52412ffb841b46e18b
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Jan 20 23:13:34 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Jan 20 23:19:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56162f0

app-misc/golly: add doc link to metadata.xml

Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/metadata.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
index 344716a3cf52..cd901ab7ee5a 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -7,10 +7,11 @@
 Maciej Barć
   
   
-Golly is an open source, cross-platform application for exploring
-Conway's Game of Life and many other types of cellular automata.
+Golly is an open source, cross-platform application for exploring Conway's
+Game of Life and many other types of cellular automata.
   
   
+https://golly.sourceforge.net/Help/index.html
 golly

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2023-01-20 Thread Maciej Barć

commit: 81b2fcc4ef99f828f27fc5d2621bd89f03ba6558
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Jan 20 23:10:39 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Jan 20 23:19:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b2fcc4

app-misc/golly: bump to 4.2

Bug: https://bugs.gentoo.org/577030
Closes: https://bugs.gentoo.org/890330
Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/Manifest |  1 +
 app-misc/golly/golly-4.2.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 547f4e8e0b82..8534b248b213 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1,3 @@
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B 
fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32
 SHA512 
3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
 DIST golly-4.1-src.tar.gz 14877727 BLAKE2B 
d9cac1250901a39d6a360b527c6f4872fc78d0426ea255b9f9129136b938a6655ff59f8c5b0204fd44f4ac0ae76e307c763ddb24a1d8a00bd4e548e4ac2277c3
 SHA512 
bc050a216a36091f0df42e61a19c34353c6306dc1ae86c194693c85a4489b118435da238b25017bde4b3d31a79e12a6988f7b7da5ae90cfcc9ca0795e66d4a99
+DIST golly-4.2-src.tar.gz 15348982 BLAKE2B 
21ebed4c282a77a3f61aafa98936c0bb39b39a7c97505e96fc43ac720bd2eea4cf20996ca28c801f79a46577a0cf99ff60614ce134081605d14ca5972c841d50
 SHA512 
b9f5cfdfe9b96590411695805dd8b875329c81027fef98dff3f16b832018be2ad3a06583bb64e12fb305268feba2347ef63c4586ff0e645721a8085f04ab382a

diff --git a/app-misc/golly/golly-4.2.ebuild b/app-misc/golly/golly-4.2.ebuild
new file mode 100644
index ..2cdfc69578d6
--- /dev/null
+++ b/app-misc/golly/golly-4.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER=3.2-gtk3
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/
+   https://sourceforge.net/projects/golly/;
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   sys-libs/zlib
+   virtual/opengl
+   x11-libs/wxGTK:${WX_GTK_VER}[X,curl,opengl,sdl,tiff]
+   ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.0-CFLAGS.patch )
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   setup-wxwidgets
+}
+
+src_compile() {
+   local -a mymakeopts=(
+   ENABLE_SOUND=yes
+   GOLLYDIR="${EPREFIX}/usr/share/${PN}"
+   PYTHON=${EPYTHON}
+   WX_CONFIG=${WX_CONFIG}
+   AR="$(tc-getAR)"
+   CC="$(tc-getCC)"
+   CXX="$(tc-getCXX)"
+   CXXC="$(tc-getCXX)"
+   RANLIB="$(tc-getRANLIB)"
+   )
+   emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}"
+}
+
+src_install() {
+   # Has no 'make install', let's install files manually.
+   exeinto /usr/bin
+   doexe golly bgolly
+
+   insinto /usr/share/${PN}
+   doins -r Help Patterns Scripts Rules docs
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2022-03-19 Thread David Seifert

commit: 0401db27a1043f25aec063624a2cb0ae0a0d5d74
Author: David Seifert  gentoo  org>
AuthorDate: Sat Mar 19 23:16:49 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Mar 19 23:16:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0401db27

app-misc/golly: quote $(tc-*) calls

Signed-off-by: David Seifert  gentoo.org>

 app-misc/golly/golly-4.0.ebuild| 12 ++--
 app-misc/golly/golly-4.1-r1.ebuild | 10 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index 337a05a7ad44..f7186fa43c15 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,12 +40,12 @@ pkg_setup() {
 src_compile() {
emake -C gui-wx -f makefile-gtk \
\
-   CC=$(tc-getCC) \
-   CXX=$(tc-getCXX) \
-   CXXC=$(tc-getCXX) \
+   CC="$(tc-getCC)" \
+   CXX="$(tc-getCXX)" \
+   CXXC="$(tc-getCXX)" \
\
-   AR=$(tc-getAR) \
-   RANLIB=$(tc-getRANLIB) \
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)" \
\
PYTHON=${EPYTHON} \
WX_CONFIG=${WX_CONFIG} \

diff --git a/app-misc/golly/golly-4.1-r1.ebuild 
b/app-misc/golly/golly-4.1-r1.ebuild
index fe656c162698..63e7520d40f4 100644
--- a/app-misc/golly/golly-4.1-r1.ebuild
+++ b/app-misc/golly/golly-4.1-r1.ebuild
@@ -39,11 +39,11 @@ src_compile() {
GOLLYDIR="${EPREFIX}/usr/share/${PN}"
PYTHON=${EPYTHON}
WX_CONFIG=${WX_CONFIG}
-   AR=$(tc-getAR)
-   CC=$(tc-getCC)
-   CXX=$(tc-getCXX)
-   CXXC=$(tc-getCXX)
-   RANLIB=$(tc-getRANLIB)
+   AR="$(tc-getAR)"
+   CC="$(tc-getCC)"
+   CXX="$(tc-getCXX)"
+   CXXC="$(tc-getCXX)"
+   RANLIB="$(tc-getRANLIB)"
)
emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}"
 }

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2022-01-31 Thread Jakov Smolić

commit: 179e555ebd7c32d2cea12278be2ef3adabd5a6e3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Jan 31 19:56:53 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Jan 31 19:56:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179e555e

app-misc/golly: Stabilize 4.1-r1 amd64, #832407

Signed-off-by: Jakov Smolić  gentoo.org>

 app-misc/golly/golly-4.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/golly/golly-4.1-r1.ebuild 
b/app-misc/golly/golly-4.1-r1.ebuild
index b502a58b492a..74fbc45b357c 100644
--- a/app-misc/golly/golly-4.1-r1.ebuild
+++ b/app-misc/golly/golly-4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2022-01-31 Thread Jakov Smolić

commit: 14221ac901c7527f94d795dc72eb55225df69caa
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Jan 31 19:57:01 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Jan 31 19:57:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14221ac9

app-misc/golly: Stabilize 4.1-r1 x86, #832407

Signed-off-by: Jakov Smolić  gentoo.org>

 app-misc/golly/golly-4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-4.1-r1.ebuild 
b/app-misc/golly/golly-4.1-r1.ebuild
index 74fbc45b357c..fe656c162698 100644
--- a/app-misc/golly/golly-4.1-r1.ebuild
+++ b/app-misc/golly/golly-4.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2021-12-01 Thread Maciej Barć

commit: d115701d7b1f05ce1e5651805d6ee9750c52456d
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Dec  1 23:12:43 2021 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Dec  1 23:13:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d115701d

app-misc/golly: disable perl integration

requires perl with ithreads, let's not add (conditional) deps for it

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/{golly-4.1.ebuild => golly-4.1-r1.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-misc/golly/golly-4.1.ebuild 
b/app-misc/golly/golly-4.1-r1.ebuild
similarity index 98%
rename from app-misc/golly/golly-4.1.ebuild
rename to app-misc/golly/golly-4.1-r1.ebuild
index 623f94070a39..b502a58b492a 100644
--- a/app-misc/golly/golly-4.1.ebuild
+++ b/app-misc/golly/golly-4.1-r1.ebuild
@@ -36,7 +36,6 @@ pkg_setup() {
 src_compile() {
local mymakeopts=(
ENABLE_SOUND=yes
-   ENABLE_PERL=yes
GOLLYDIR="${EPREFIX}/usr/share/${PN}"
PYTHON=${EPYTHON}
WX_CONFIG=${WX_CONFIG}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2021-12-01 Thread Maciej Barć

commit: 607bb94b5de6f66b3f46048c9c56f2d4f1fdc070
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Dec  1 08:53:39 2021 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Dec  1 08:53:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607bb94b

app-misc/golly: take maintainership

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/metadata.xml | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
index 98448a9c4a04..344716a3cf52 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -1,8 +1,16 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
+
 
-   
-   
-   golly
-   
+  
+x...@gentoo.org
+Maciej Barć
+  
+  
+Golly is an open source, cross-platform application for exploring
+Conway's Game of Life and many other types of cellular automata.
+  
+  
+golly
+

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2021-12-01 Thread Maciej Barć

commit: 15eb1454cb24fdc2ac23a5069312528b85d95df1
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Dec  1 08:49:31 2021 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Dec  1 08:53:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15eb1454

app-misc/golly: bump to 4.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć  gentoo.org>

 app-misc/golly/Manifest |  1 +
 app-misc/golly/golly-4.1.ebuild | 68 +
 2 files changed, 69 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 18e55e3d1acc..547f4e8e0b82 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1 +1,2 @@
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B 
fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32
 SHA512 
3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
+DIST golly-4.1-src.tar.gz 14877727 BLAKE2B 
d9cac1250901a39d6a360b527c6f4872fc78d0426ea255b9f9129136b938a6655ff59f8c5b0204fd44f4ac0ae76e307c763ddb24a1d8a00bd4e548e4ac2277c3
 SHA512 
bc050a216a36091f0df42e61a19c34353c6306dc1ae86c194693c85a4489b118435da238b25017bde4b3d31a79e12a6988f7b7da5ae90cfcc9ca0795e66d4a99

diff --git a/app-misc/golly/golly-4.1.ebuild b/app-misc/golly/golly-4.1.ebuild
new file mode 100644
index ..623f94070a39
--- /dev/null
+++ b/app-misc/golly/golly-4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
+
+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"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   sys-libs/zlib
+   virtual/opengl
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,sdl,tiff]
+   ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.0-CFLAGS.patch )
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   setup-wxwidgets
+}
+
+src_compile() {
+   local mymakeopts=(
+   ENABLE_SOUND=yes
+   ENABLE_PERL=yes
+   GOLLYDIR="${EPREFIX}/usr/share/${PN}"
+   PYTHON=${EPYTHON}
+   WX_CONFIG=${WX_CONFIG}
+   AR=$(tc-getAR)
+   CC=$(tc-getCC)
+   CXX=$(tc-getCXX)
+   CXXC=$(tc-getCXX)
+   RANLIB=$(tc-getRANLIB)
+   )
+   emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}"
+}
+
+src_install() {
+   # has no 'make install' Let's install files manually.
+   dobin golly bgolly
+   insinto /usr/share/${PN}
+   doins -r Help Patterns Scripts Rules docs
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2021-08-04 Thread Sergei Trofimovich

commit: 0de5642e46b5da47435c4148a6a4d22d57df7456
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Aug  4 08:50:01 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Aug  4 09:01:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de5642e

app-misc/golly: drop slyfox@ from maintainers down to m-n

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
index 5f6d283dd74..c06a9f3be99 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   sly...@gentoo.org
-   Sergei Trofimovich
-   
+   

golly

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2021-05-15 Thread Sergei Trofimovich

commit: 9a8f579dfb46c7129ded16afa6345402ba8815dc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat May 15 13:27:06 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat May 15 13:58:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8f579d

app-misc/golly: allow python 3.10

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/golly-4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index e62cf1408e2..337a05a7ad4 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg-utils

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/files/, app-misc/golly/

2020-12-18 Thread Sergei Trofimovich

commit: d99216f0c924f3bfe62f1707215251f51866f5ea
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 18 09:51:41 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 18 09:52:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99216f0

app-misc/golly: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest|  1 -
 .../golly/files/golly-3.3-allow-py23-exec.patch| 12 ---
 app-misc/golly/files/golly-3.3-allow-py3.patch | 90 --
 app-misc/golly/files/golly-3.3-glife-py23.patch| 32 
 .../golly/files/golly-3.3-nondynamic-python.patch  | 51 
 app-misc/golly/golly-3.4.ebuild| 70 -
 6 files changed, 256 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 41f9152dcb6..18e55e3d1ac 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
-DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 
6bd0c71083d021adb660ed8fd99865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48
 SHA512 
bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B 
fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32
 SHA512 
3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d

diff --git a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch 
b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
deleted file mode 100644
index e46b608ed6c..000
--- a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-'execfile' is python-2-only. 'exec/open' works for both python2 and python3.
 a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -3356,7 +3388,7 @@ void RunPythonScript(const wxString& filepath)
- // for the global namespace so that this script cannot change the
- // globals of a caller script (which is possible now that RunScript
- // is re-entrant)
--wxString command = wxT("execfile('") + fpath + wxT("',{})");
-+wxString command = wxT("exec(open('") + fpath + wxT("').read(),{})");
- PyRun_SimpleString(command.mb_str(wxConvLocal));
- // don't use wxConvUTF8 in above line because caller has already converted
- // filepath to decomposed UTF8 if on a Mac

diff --git a/app-misc/golly/files/golly-3.3-allow-py3.patch 
b/app-misc/golly/files/golly-3.3-allow-py3.patch
deleted file mode 100644
index 54a04783081..000
--- a/app-misc/golly/files/golly-3.3-allow-py3.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-The patch allows python3 as a python implementation.
-Ports module loading to conditional python3 support.
 a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -19,7 +19,7 @@ AC_ARG_WITH([python-shlib], 
[AS_HELP_STRING([--with-python-shlib=ARG],
-   , [with_python_shlib=check])
- AC_ARG_VAR([GOLLYDIR], [golly data directory [default=DATADIR/golly]])
- AC_ARG_VAR([PERL], [Perl 5 interpreter])
--AC_ARG_VAR([PYTHON], [Python 2 interpreter])
-+AC_ARG_VAR([PYTHON], [Python interpreter])
- 
- # Check for build tools:
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-@@ -76,7 +76,7 @@ AS_IF([test "x$enable_perl" = xyes], [
- ])
- 
- # Find Python
--AC_PATH_PROGS(PYTHON, [python2 python])
-+AC_CHECK_PROGS(PYTHON, [python python3 python2])
- AS_IF([test "x$PYTHON" = x], [AC_MSG_ERROR([missing Python])])
- AC_SUBST([PYTHON_INCLUDE], [-I"'`$PYTHON -c "import distutils.sysconfig; 
print(distutils.sysconfig.get_python_inc())"`'"])
- AS_IF([test "x$with_python_shlib" = xcheck],
 a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -90,6 +90,12 @@
- #include 
- #endif
- 
-+#if PY_MAJOR_VERSION >= 3
-+// python-3 got rid of int/log distinction
-+#define PyInt_AsLong PyLong_AsLong
-+#define PyInt_FromLong PyLong_FromLong
-+#endif
-+
- #ifdef USE_PYTHON_DYNAMIC
- 
- #ifndef __WXMAC__
-@@ -3268,6 +3274,22 @@ static PyMethodDef py_methods[] = {
- { NULL, NULL, 0, NULL }
- };
- 
-+#if PY_MAJOR_VERSION >= 3
-+static PyModuleDef golly_module = {
-+PyModuleDef_HEAD_INIT,
-+"golly", /* name */
-+NULL,/* doc */
-+-1,  /* size */
-+py_methods, /* methoods */
-+};
-+
-+PyMODINIT_FUNC
-+PyInit_golly(void)
-+{
-+return PyModule_Create(_module);
-+}
-+#endif
-+
- // 
=
- 
- bool pyinited = false; // InitPython has been successfully called?
-@@ -3280,6 +3302,13 @@ bool InitPython()
- if (!LoadPythonLib()) return false;
- #endif
- 
-+#if PY_MAJOR_VERSION >= 3
-+// Autoload 'golly' builtin module at

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-12-16 Thread Sam James

commit: c7ecf89296596d96388ee3b610c2c0c376a84820
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 16 19:51:33 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 16 19:51:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ecf892

app-misc/golly: Stabilize 4.0 amd64, #758776

Signed-off-by: Sam James  gentoo.org>

 app-misc/golly/golly-4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index c6e352c091f..e62cf1408e2 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-12-06 Thread Thomas Deutschmann

commit: d3c77e880627dde9a42faa897f4071dcc54ac59f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Dec  6 17:04:16 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Dec  6 17:04:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c77e88

app-misc/golly: x86 stable (bug #758776)

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-misc/golly/golly-4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index a8adfaba6a9..c6e352c091f 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-11-06 Thread Sergei Trofimovich

commit: 2ddf2fe35b66b1e68a640a566d73e6051af34efd
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Nov  6 23:49:31 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Nov  6 23:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddf2fe3

app-misc/golly: uncomditionally enable tiff support from wx

golly-3.4 and above does not allow disabling tiff support.

Reported-by: John Helmert III (ajak)
Closes: https://bugs.gentoo.org/753389
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/golly-3.4.ebuild | 4 ++--
 app-misc/golly/golly-4.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
index 550db180b0d..b1dcbb7f820 100644
--- a/app-misc/golly/golly-3.4.ebuild
+++ b/app-misc/golly/golly-3.4.ebuild
@@ -15,12 +15,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="tiff"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="virtual/opengl
sys-libs/zlib
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff]
${PYTHON_DEPS}
 "
 

diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index 6f6fa88b72b..a8adfaba6a9 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -15,12 +15,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="tiff"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="virtual/opengl
sys-libs/zlib
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff]
${PYTHON_DEPS}
 "

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/, app-misc/golly/files/

2020-11-05 Thread Sergei Trofimovich

commit: f867c11bb15d204285c8cd1e8208e675a0a8fe2e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Nov  5 08:28:11 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Nov  5 08:36:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f867c11b

app-misc/golly: bump up to 4.0

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest |  1 +
 app-misc/golly/files/golly-4.0-CFLAGS.patch | 24 ++
 app-misc/golly/golly-4.0.ebuild | 72 +
 3 files changed, 97 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index eacf4e5180b..41f9152dcb6 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1 +1,2 @@
 DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 
6bd0c71083d021adb660ed8fd99865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48
 SHA512 
bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
+DIST golly-4.0-src.tar.gz 5579026 BLAKE2B 
fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32
 SHA512 
3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d

diff --git a/app-misc/golly/files/golly-4.0-CFLAGS.patch 
b/app-misc/golly/files/golly-4.0-CFLAGS.patch
new file mode 100644
index 000..3ac729df93e
--- /dev/null
+++ b/app-misc/golly/files/golly-4.0-CFLAGS.patch
@@ -0,0 +1,24 @@
+--- a/lua/Makefile
 b/lua/Makefile
+@@ -13,7 +13,7 @@ osx_ge = $(shell if [ $(OS_VERSION) -ge $(1) ] ; then echo 
"$(2)"; else echo "$(
+ 
+ CFLAGS += $(call osx_ge,10,"-mmacosx-version-min=10.10","")
+ else
+-CFLAGS = -O2 -Wall -Wextra -DLUA_USE_LINUX
++CFLAGS += -Wall -Wextra -DLUA_USE_LINUX
+ endif
+ 
+ OBJ_FILES = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o 
llex.o \
+--- a/lua/Makefile
 b/lua/Makefile
+@@ -25,8 +25,8 @@ OBJ_FILES = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o 
lfunc.o lgc.o llex.o
+ all: $(LUA_LIB)
+ 
+ $(LUA_LIB): $(OBJ_FILES)
+-  ar rcu $@ $(OBJ_FILES)
+-  ranlib $@
++  $(AR) rcu $@ $(OBJ_FILES)
++  $(RANLIB) $@
+ 
+ clean:
+   rm -f $(LUA_LIB) $(OBJ_FILES)

diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
new file mode 100644
index 000..6f6fa88b72b
--- /dev/null
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop python-single-r1 toolchain-funcs 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?]
+   ${PYTHON_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.0-CFLAGS.patch
+)
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   setup-wxwidgets
+}
+
+src_compile() {
+   emake -C gui-wx -f makefile-gtk \
+   \
+   CC=$(tc-getCC) \
+   CXX=$(tc-getCXX) \
+   CXXC=$(tc-getCXX) \
+   \
+   AR=$(tc-getAR) \
+   RANLIB=$(tc-getRANLIB) \
+   \
+   PYTHON=${EPYTHON} \
+   WX_CONFIG=${WX_CONFIG} \
+   \
+   GOLLYDIR="${EPREFIX}/usr/share/${PN}"
+}
+
+src_install() {
+   # has no 'make install' Let's install files manually.
+   dobin golly bgolly
+   insinto /usr/share/${PN}
+   doins -r Help Patterns Scripts Rules docs
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-09-06 Thread Sergei Trofimovich

commit: 1f9c21270881b2ac493cdb70c838fef265ae8aba
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep  6 08:33:11 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep  6 08:34:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9c2127

app-misc/golly: drop old

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest|  1 -
 app-misc/golly/golly-3.3-r3.ebuild | 70 --
 2 files changed, 71 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 212e4446b77..eacf4e5180b 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
-DIST golly-3.3-src.tar.gz 5465595 BLAKE2B 
e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba
 SHA512 
2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
 DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 
6bd0c71083d021adb660ed8fd99865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48
 SHA512 
bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47

diff --git a/app-misc/golly/golly-3.3-r3.ebuild 
b/app-misc/golly/golly-3.3-r3.ebuild
deleted file mode 100644
index 8e1fd8ca096..000
--- a/app-misc/golly/golly-3.3-r3.ebuild
+++ /dev/null
@@ -1,70 +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-gtk3
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools desktop 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?]
-   ${PYTHON_DEPS}
-"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-   "${FILESDIR}"/${P}-nondynamic-python.patch
-   "${FILESDIR}"/${P}-allow-py23-exec.patch
-   "${FILESDIR}"/${P}-glife-py23.patch
-   "${FILESDIR}"/${P}-allow-py3.patch
-)
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   setup-wxwidgets
-}
-
-src_prepare() {
-   default
-
-   # patches change configure.ac and Makefile.am
-   pushd gui-wx/configure
-   eautoreconf
-   popd
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-09-05 Thread Thomas Deutschmann

commit: a1caa2f938c9741cb89a0ec87823ce084372829e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  5 16:11:57 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  5 16:11:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1caa2f9

app-misc/golly: x86 stable (bug #740338)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-misc/golly/golly-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
index 1a37135cc31..550db180b0d 100644
--- a/app-misc/golly/golly-3.4.ebuild
+++ b/app-misc/golly/golly-3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-09-05 Thread Sam James

commit: ffd53e1fe323249e09c4fecca6d92d29ec27bb36
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  5 15:17:55 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  5 15:17:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd53e1f

app-misc/golly: Stabilize 3.4 amd64, #740338

Signed-off-by: Sam James  gentoo.org>

 app-misc/golly/golly-3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
index 33eaee6f742..1a37135cc31 100644
--- a/app-misc/golly/golly-3.4.ebuild
+++ b/app-misc/golly/golly-3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-08-06 Thread Sergei Trofimovich

commit: 59c83dd3ff846869de5fde84e36867cdfc3b4779
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug  6 21:22:21 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug  6 21:22:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c83dd3

app-misc/golly: drop old

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/golly-3.3-r1.ebuild | 51 --
 1 file changed, 51 deletions(-)

diff --git a/app-misc/golly/golly-3.3-r1.ebuild 
b/app-misc/golly/golly-3.3-r1.ebuild
deleted file mode 100644
index 26742c324c9..000
--- a/app-misc/golly/golly-3.3-r1.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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-08-05 Thread Agostino Sarubbo

commit: 0e2596f168cad848d458ad15981357d227e33732
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:51 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2596f1

app-misc/golly: x86 stable wrt bug #735192

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/golly/golly-3.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.3-r3.ebuild 
b/app-misc/golly/golly-3.3-r3.ebuild
index c7042f51869..8e1fd8ca096 100644
--- a/app-misc/golly/golly-3.3-r3.ebuild
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-08-05 Thread Agostino Sarubbo

commit: acc9af6e99e6c040e022dc4abcc7ecc9e155d3e0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 13:51:02 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 13:51:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc9af6e

app-misc/golly: amd64 stable wrt bug #735192

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/golly/golly-3.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.3-r3.ebuild 
b/app-misc/golly/golly-3.3-r3.ebuild
index f499453a833..c7042f51869 100644
--- a/app-misc/golly/golly-3.3-r3.ebuild
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-08-03 Thread Sergei Trofimovich

commit: 879c4b46f25f92729cda38f2ac533f05b060bc86
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Aug  3 22:48:47 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Aug  3 22:54:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=879c4b46

app-misc/golly: bump up to 3.4

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest |  1 +
 app-misc/golly/golly-3.4.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 3400cf99a3a..212e4446b77 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1 +1,2 @@
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B 
e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba
 SHA512 
2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
+DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 
6bd0c71083d021adb660ed8fd99865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48
 SHA512 
bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47

diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
new file mode 100644
index 000..33eaee6f742
--- /dev/null
+++ b/app-misc/golly/golly-3.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools desktop 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?]
+   ${PYTHON_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.3-nondynamic-python.patch
+   "${FILESDIR}"/${PN}-3.3-allow-py23-exec.patch
+   "${FILESDIR}"/${PN}-3.3-glife-py23.patch
+   "${FILESDIR}"/${PN}-3.3-allow-py3.patch
+)
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   setup-wxwidgets
+}
+
+src_prepare() {
+   default
+
+   # patches change configure.ac and Makefile.am
+   pushd gui-wx/configure
+   eautoreconf
+   popd
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-08-02 Thread Michał Górny

commit: 4255d370c40f630a8ac42769508ccfab68b09517
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  2 11:48:53 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  2 12:02:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4255d370

app-misc/golly: Remove py2.7 where possible

Signed-off-by: Michał Górny  gentoo.org>

 app-misc/golly/golly-3.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.3-r3.ebuild 
b/app-misc/golly/golly-3.3-r3.ebuild
index 10240aa63d7..f499453a833 100644
--- a/app-misc/golly/golly-3.3-r3.ebuild
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools desktop python-single-r1 wxwidgets xdg-utils

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-07-11 Thread Sergei Trofimovich

commit: b6b8f3cbac28ebfa017d905ef3600d082321aa30
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul 11 12:57:46 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 11 12:57:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b8f3cb

app-misc/golly: drop old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/golly-3.3-r2.ebuild | 70 --
 1 file changed, 70 deletions(-)

diff --git a/app-misc/golly/golly-3.3-r2.ebuild 
b/app-misc/golly/golly-3.3-r2.ebuild
deleted file mode 100644
index e3a3e4a7e59..000
--- a/app-misc/golly/golly-3.3-r2.ebuild
+++ /dev/null
@@ -1,70 +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=( python{2_7,3_{7,8,9}} )
-
-inherit autotools desktop 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?]
-   ${PYTHON_DEPS}
-"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-   "${FILESDIR}"/${P}-nondynamic-python.patch
-   "${FILESDIR}"/${P}-allow-py23-exec.patch
-   "${FILESDIR}"/${P}-glife-py23.patch
-   "${FILESDIR}"/${P}-allow-py3.patch
-)
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   setup-wxwidgets
-}
-
-src_prepare() {
-   default
-
-   # patches change configure.ac and Makefile.am
-   pushd gui-wx/configure
-   eautoreconf
-   popd
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-07-03 Thread Sergei Trofimovich

commit: 1358b7c339533af4059bad30fb09251777831f8b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jul  3 22:06:49 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  3 22:06:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1358b7c3

app-misc/golly: switch to gtk3-based wxwidgets

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/golly-3.3-r3.ebuild | 70 ++
 1 file changed, 70 insertions(+)

diff --git a/app-misc/golly/golly-3.3-r3.ebuild 
b/app-misc/golly/golly-3.3-r3.ebuild
new file mode 100644
index 000..10240aa63d7
--- /dev/null
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+
+inherit autotools desktop 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?]
+   ${PYTHON_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+   "${FILESDIR}"/${P}-nondynamic-python.patch
+   "${FILESDIR}"/${P}-allow-py23-exec.patch
+   "${FILESDIR}"/${P}-glife-py23.patch
+   "${FILESDIR}"/${P}-allow-py3.patch
+)
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   setup-wxwidgets
+}
+
+src_prepare() {
+   default
+
+   # patches change configure.ac and Makefile.am
+   pushd gui-wx/configure
+   eautoreconf
+   popd
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-06-27 Thread Sergei Trofimovich

commit: 2e023c9420fe1e39660698d5c0c5f7492b22bc5f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 27 19:29:42 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 27 21:02:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e023c94

app-misc/golly: drop unused eclasses

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/golly-3.3-r2.ebuild | 51 ++
 1 file changed, 51 insertions(+)

diff --git a/app-misc/golly/golly-3.3-r2.ebuild 
b/app-misc/golly/golly-3.3-r2.ebuild
new file mode 100644
index 000..9ae4bf4acd8
--- /dev/null
+++ b/app-misc/golly/golly-3.3-r2.ebuild
@@ -0,0 +1,51 @@
+# 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 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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/files/, app-misc/golly/

2020-06-27 Thread Sergei Trofimovich

commit: b9f7c1bd0d361768a432b5c9ba4f3c9e751bc1da
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 27 21:01:53 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 27 21:02:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f7c1bd

app-misc/golly: port to python3

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../golly/files/golly-3.3-allow-py23-exec.patch| 12 +++
 app-misc/golly/files/golly-3.3-allow-py3.patch | 90 ++
 app-misc/golly/files/golly-3.3-glife-py23.patch| 32 
 .../golly/files/golly-3.3-nondynamic-python.patch  | 51 
 app-misc/golly/golly-3.3-r2.ebuild | 29 +--
 5 files changed, 209 insertions(+), 5 deletions(-)

diff --git a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch 
b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
new file mode 100644
index 000..e46b608ed6c
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
@@ -0,0 +1,12 @@
+'execfile' is python-2-only. 'exec/open' works for both python2 and python3.
+--- a/gui-wx/wxpython.cpp
 b/gui-wx/wxpython.cpp
+@@ -3356,7 +3388,7 @@ void RunPythonScript(const wxString& filepath)
+ // for the global namespace so that this script cannot change the
+ // globals of a caller script (which is possible now that RunScript
+ // is re-entrant)
+-wxString command = wxT("execfile('") + fpath + wxT("',{})");
++wxString command = wxT("exec(open('") + fpath + wxT("').read(),{})");
+ PyRun_SimpleString(command.mb_str(wxConvLocal));
+ // don't use wxConvUTF8 in above line because caller has already converted
+ // filepath to decomposed UTF8 if on a Mac

diff --git a/app-misc/golly/files/golly-3.3-allow-py3.patch 
b/app-misc/golly/files/golly-3.3-allow-py3.patch
new file mode 100644
index 000..54a04783081
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-allow-py3.patch
@@ -0,0 +1,90 @@
+The patch allows python3 as a python implementation.
+Ports module loading to conditional python3 support.
+--- a/gui-wx/configure/configure.ac
 b/gui-wx/configure/configure.ac
+@@ -19,7 +19,7 @@ AC_ARG_WITH([python-shlib], 
[AS_HELP_STRING([--with-python-shlib=ARG],
+   , [with_python_shlib=check])
+ AC_ARG_VAR([GOLLYDIR], [golly data directory [default=DATADIR/golly]])
+ AC_ARG_VAR([PERL], [Perl 5 interpreter])
+-AC_ARG_VAR([PYTHON], [Python 2 interpreter])
++AC_ARG_VAR([PYTHON], [Python interpreter])
+ 
+ # Check for build tools:
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+@@ -76,7 +76,7 @@ AS_IF([test "x$enable_perl" = xyes], [
+ ])
+ 
+ # Find Python
+-AC_PATH_PROGS(PYTHON, [python2 python])
++AC_CHECK_PROGS(PYTHON, [python python3 python2])
+ AS_IF([test "x$PYTHON" = x], [AC_MSG_ERROR([missing Python])])
+ AC_SUBST([PYTHON_INCLUDE], [-I"'`$PYTHON -c "import distutils.sysconfig; 
print(distutils.sysconfig.get_python_inc())"`'"])
+ AS_IF([test "x$with_python_shlib" = xcheck],
+--- a/gui-wx/wxpython.cpp
 b/gui-wx/wxpython.cpp
+@@ -90,6 +90,12 @@
+ #include 
+ #endif
+ 
++#if PY_MAJOR_VERSION >= 3
++// python-3 got rid of int/log distinction
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#endif
++
+ #ifdef USE_PYTHON_DYNAMIC
+ 
+ #ifndef __WXMAC__
+@@ -3268,6 +3274,22 @@ static PyMethodDef py_methods[] = {
+ { NULL, NULL, 0, NULL }
+ };
+ 
++#if PY_MAJOR_VERSION >= 3
++static PyModuleDef golly_module = {
++PyModuleDef_HEAD_INIT,
++"golly", /* name */
++NULL,/* doc */
++-1,  /* size */
++py_methods, /* methoods */
++};
++
++PyMODINIT_FUNC
++PyInit_golly(void)
++{
++return PyModule_Create(_module);
++}
++#endif
++
+ // 
=
+ 
+ bool pyinited = false; // InitPython has been successfully called?
+@@ -3280,6 +3302,13 @@ bool InitPython()
+ if (!LoadPythonLib()) return false;
+ #endif
+ 
++#if PY_MAJOR_VERSION >= 3
++// Autoload 'golly' builtin module at interpreter start.
++if (PyImport_AppendInittab("golly", PyInit_golly) == -1) {
++Warning(_("Error: could not extend in-built modules 
table\n"));
++}
++#endif
++
+ // only initialize the Python interpreter once, mainly because 
multiple
+ // Py_Initialize/Py_Finalize calls cause leaks of about 12K each time!
+ Py_Initialize();
+@@ -3287,9 +3316,12 @@ bool InitPython()
+ #ifdef USE_PYTHON_DYNAMIC
+ GetPythonExceptions();
+ #endif
+-
+-// allow Python to call the above py_* routines
+-Py_InitModule((char*)"golly", py_methods);
++
++// Python-3 uses module constructor
++#if PY_MAJOR_VERSION < 3
++// allow Python to call the above py_* routines
++Py_InitModule((char*)"golly",

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-06-27 Thread Sergei Trofimovich

commit: e4e5a0e92cd78ec92b5cbba2b32cb2a0c793551b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 27 08:52:30 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 27 08:54:03 2020 +
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  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

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-06-20 Thread Sergei Trofimovich

commit: b5cdd754b8c4c528a258db72069f0dd0eea0f7c7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 20 08:44:58 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 20 08:45:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cdd754

app-misc/golly: drop optional python2 scripting support

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/golly-3.3-r1.ebuild | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app-misc/golly/golly-3.3-r1.ebuild 
b/app-misc/golly/golly-3.3-r1.ebuild
index 26742c324c9..27ee1bae14e 100644
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
 
-inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
+inherit desktop eutils flag-o-matic wxwidgets xdg-utils
 
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/;
@@ -16,13 +15,11 @@ 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}"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}-src

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/files/

2020-04-10 Thread Sergei Trofimovich

commit: 48162c694b599026ec2b76f1f4fee0e8d5c15b2f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Apr 10 13:00:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 10 14:42:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48162c69

app-misc/golly: remove unused patch(es)

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15287
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/files/golly-3.2-mouse-1.patch | 63 
 app-misc/golly/files/golly-3.2-mouse-2.patch | 45 
 2 files changed, 108 deletions(-)

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 ab4fc703f50..000
--- 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 
-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 b2655ba6212..000
--- 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 
-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

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-03-24 Thread Sergei Trofimovich

commit: 772995d6e6489b22b96cdbd4acbeebbe5868ea69
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Mar 24 07:03:36 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Mar 24 07:05:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772995d6

app-misc/golly: revert "drop old"

This reverts commit 629349895fd57bdab5d99e54cc658873d1ebec62.

Dropped latest ebuild by accident.

Reported-by: Jeroen Roovers
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest|  1 +
 app-misc/golly/golly-3.2.ebuild| 59 ++
 app-misc/golly/golly-3.3-r1.ebuild | 51 
 3 files changed, 111 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 3400cf99a3a..a54d3b09dd6 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1 +1,2 @@
+DIST golly-3.2-src.tar.gz 5261483 BLAKE2B 
c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235
 SHA512 
bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B 
e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba
 SHA512 
2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265

diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
new file mode 100644
index 000..733fce4ccb9
--- /dev/null
+++ b/app-misc/golly/golly-3.2.ebuild
@@ -0,0 +1,59 @@
+# 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-r1.ebuild 
b/app-misc/golly/golly-3.3-r1.ebuild
new file mode 100644
index 000..26742c324c9
--- /dev/null
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -0,0 +1,51 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-03-24 Thread Sergei Trofimovich

commit: 3b8532c0857c385f666ac5d34204476035a8c2c1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Mar 24 07:05:30 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Mar 24 07:05:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8532c0

app-misc/golly: drop old

Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest |  1 -
 app-misc/golly/golly-3.2.ebuild | 59 -
 app-misc/golly/golly-3.3.ebuild | 51 ---
 3 files changed, 111 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index a54d3b09dd6..3400cf99a3a 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
-DIST golly-3.2-src.tar.gz 5261483 BLAKE2B 
c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235
 SHA512 
bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B 
e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba
 SHA512 
2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265

diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
deleted file mode 100644
index 733fce4ccb9..000
--- 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 dffedc97b55..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-03-23 Thread Sergei Trofimovich

commit: 629349895fd57bdab5d99e54cc658873d1ebec62
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 23 23:39:46 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 23 23:57:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62934989

app-misc/golly: drop old

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest|  1 -
 app-misc/golly/golly-3.2.ebuild| 59 --
 app-misc/golly/golly-3.3-r1.ebuild | 51 
 3 files changed, 111 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index a54d3b09dd6..3400cf99a3a 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
-DIST golly-3.2-src.tar.gz 5261483 BLAKE2B 
c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235
 SHA512 
bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B 
e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba
 SHA512 
2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265

diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
deleted file mode 100644
index 733fce4ccb9..000
--- 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-r1.ebuild 
b/app-misc/golly/golly-3.3-r1.ebuild
deleted file mode 100644
index 26742c324c9..000
--- a/app-misc/golly/golly-3.3-r1.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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-02-11 Thread Agostino Sarubbo

commit: d0ef5e6afe3c486ef67ad13e84db7f9f63f83f43
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Feb 12 07:57:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Feb 12 07:57:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ef5e6a

app-misc/golly: x86 stable wrt bug #708890

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/golly/golly-3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.3-r1.ebuild 
b/app-misc/golly/golly-3.3-r1.ebuild
index 9834ca05dd5..26742c324c9 100644
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-02-11 Thread Piotr Karbowski

commit: 924f45052bf3745091b931ccd562229d88b79eac
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Feb 12 00:02:57 2020 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Feb 12 00:04:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924f4505

app-misc/golly-3.3-r1: amd64 stable (bug 708890)

Signed-off-by: Piotr Karbowski  gentoo.org>

 app-misc/golly/golly-3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.3-r1.ebuild 
b/app-misc/golly/golly-3.3-r1.ebuild
index dffedc97b55..9834ca05dd5 100644
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-02-11 Thread Sergei Trofimovich

commit: 1b351fe6533cf16ed689aee82bd4f817af25527c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Feb 11 23:02:45 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 11 23:03:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b351fe6

app-misc/golly: use desktop/xdg-utils eclasses instead of gnome-2

Reported-by:  Agostino Sarubbo
Closes: https://bugs.gentoo.org/709262
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/{golly-3.3.ebuild => golly-3.3-r1.ebuild} | 12 
 app-misc/golly/golly-3.3.ebuild  | 12 
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app-misc/golly/golly-3.3.ebuild 
b/app-misc/golly/golly-3.3-r1.ebuild
similarity index 81%
copy from app-misc/golly/golly-3.3.ebuild
copy to app-misc/golly/golly-3.3-r1.ebuild
index f3319b32e24..dffedc97b55 100644
--- a/app-misc/golly/golly-3.3.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 WX_GTK_VER=3.0
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
+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/;
@@ -42,14 +42,10 @@ src_install() {
make_desktop_entry ${PN} "Golly" ${PN} "Science"
 }
 
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
 pkg_postinst() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }

diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
index f3319b32e24..dffedc97b55 100644
--- a/app-misc/golly/golly-3.3.ebuild
+++ b/app-misc/golly/golly-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 WX_GTK_VER=3.0
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
+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/;
@@ -42,14 +42,10 @@ src_install() {
make_desktop_entry ${PN} "Golly" ${PN} "Science"
 }
 
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
 pkg_postinst() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-02-11 Thread Agostino Sarubbo

commit: 387f98cdcf763b4f67f4048f17e45ad49170bfc6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 11 09:59:09 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 11 09:59:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387f98cd

Revert "app-misc/golly: x86 stable wrt bug #708890"

This reverts commit ce298bf4a4e1b4c8f0e7b8132ceb09515ca2f944.

Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/golly/golly-3.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
index 0555ad327d5..f3319b32e24 100644
--- a/app-misc/golly/golly-3.3.ebuild
+++ b/app-misc/golly/golly-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2020-02-11 Thread Agostino Sarubbo

commit: ce298bf4a4e1b4c8f0e7b8132ceb09515ca2f944
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 11 09:51:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 11 09:51:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce298bf4

app-misc/golly: x86 stable wrt bug #708890

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/golly/golly-3.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
index f3319b32e24..0555ad327d5 100644
--- a/app-misc/golly/golly-3.3.ebuild
+++ b/app-misc/golly/golly-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2019-12-09 Thread Sergei Trofimovich

commit: d2da5245445cbb8f7ce30efbb0800c8b5dfedaa8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Dec  9 18:06:59 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Dec  9 18:11:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2da5245

app-misc/golly: bump up to 3.3

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest |  1 +
 app-misc/golly/golly-3.3.ebuild | 55 +
 2 files changed, 56 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 7aa89aee556..a54d3b09dd6 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1 +1,2 @@
 DIST golly-3.2-src.tar.gz 5261483 BLAKE2B 
c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235
 SHA512 
bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
+DIST golly-3.3-src.tar.gz 5465595 BLAKE2B 
e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba
 SHA512 
2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265

diff --git a/app-misc/golly/golly-3.3.ebuild b/app-misc/golly/golly-3.3.ebuild
new file mode 100644
index 000..f3319b32e24
--- /dev/null
+++ b/app-misc/golly/golly-3.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 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 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
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2019-05-20 Thread Sergei Trofimovich

commit: 7fbdef9d32b29bcf47db0e1411e30907e013f05f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon May 20 18:04:39 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon May 20 18:04:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbdef9d

app-misc/golly: drop old

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest|  2 --
 app-misc/golly/golly-2.7-r1.ebuild | 50 
 app-misc/golly/golly-2.8-r1.ebuild | 58 --
 3 files changed, 110 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 2b935b9a5fa..7aa89aee556 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,3 +1 @@
-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

diff --git a/app-misc/golly/golly-2.7-r1.ebuild 
b/app-misc/golly/golly-2.7-r1.ebuild
deleted file mode 100644
index b07bc8262aa..000
--- a/app-misc/golly/golly-2.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils 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
-   sys-libs/zlib
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}
-   ${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-ECONF_SOURCE=gui-wx/configure
-
-src_configure() {
-   econf --with-perl-shlib="libperl.so"
-}
-
-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-r1.ebuild 
b/app-misc/golly/golly-2.8-r1.ebuild
deleted file mode 100644
index 0dda2847e7e..000
--- a/app-misc/golly/golly-2.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2019-05-20 Thread Mikle Kolyada

commit: 108124800a7bfad8641c4c724cdf2ba37c850afe
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 20 11:29:22 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 20 11:29:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10812480

app-misc/golly: amd64 stable wrt bug #685566

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-misc/golly/golly-3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
index 0e0e6d18602..733fce4ccb9 100644
--- a/app-misc/golly/golly-3.2.ebuild
+++ b/app-misc/golly/golly-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/, app-misc/golly/files/

2018-11-25 Thread Sergei Trofimovich

commit: 8f7accb422905ad75fac88b548a933715e23a3ac
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 25 13:08:42 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 25 13:13:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7accb4

app-misc/golly: bump up to 3.2, bug #661360

Also applied mouse patches provided by Hooloovo0 \o/

Reported-by: Hooloovo0
Closes: https://bugs.gentoo.org/661360
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/Manifest  |  1 +
 app-misc/golly/files/golly-3.2-mouse-1.patch | 63 
 app-misc/golly/files/golly-3.2-mouse-2.patch | 45 
 app-misc/golly/golly-3.2.ebuild  | 59 ++
 4 files changed, 168 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index d6b3eaf28ce..2b935b9a5fa 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1,3 @@
 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

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 000..ab4fc703f50
--- /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 
+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 000..b2655ba6212
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2018-11-25 Thread Sergei Trofimovich

commit: f7845a2ca8338f6120f49b182849e1252683c9e1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 25 12:09:50 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 25 12:09:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7845a2c

app-misc/golly: add missing wxgtk[opengl] depend, bug #611724

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  gentoo.org>

 app-misc/golly/{golly-2.8.ebuild => golly-2.8-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/golly/golly-2.8.ebuild 
b/app-misc/golly/golly-2.8-r1.ebuild
similarity index 93%
rename from app-misc/golly/golly-2.8.ebuild
rename to app-misc/golly/golly-2.8-r1.ebuild
index 1c6a36ee52e..0dda2847e7e 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}"

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2018-11-25 Thread Sergei Trofimovich

commit: 33dd0fa76286b44149e05b8e0b35e4f9c9adcf9f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 25 11:30:54 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 25 11:30:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33dd0fa7

app-misc/golly: adopt an orphan

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/golly/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
index c06a9f3be99..5f6d283dd74 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   sly...@gentoo.org
+   Sergei Trofimovich
+   

golly

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2017-04-20 Thread David Seifert

commit: 3c4f5b5013a3341b9b478aa3aca3a66b2ea0032c
Author: David Seifert  gentoo  org>
AuthorDate: Thu Apr 20 07:27:46 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Apr 20 07:58:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4f5b50

app-misc/golly: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-misc/golly/golly-2.7-r1.ebuild | 6 --
 app-misc/golly/golly-2.8.ebuild| 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app-misc/golly/golly-2.7-r1.ebuild 
b/app-misc/golly/golly-2.7-r1.ebuild
index bf721d63c03..b07bc8262aa 100644
--- a/app-misc/golly/golly-2.7-r1.ebuild
+++ b/app-misc/golly/golly-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,11 +15,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="dev-lang/perl
sys-libs/zlib
x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   ${PYTHON_DEPS}"
 
 S=${WORKDIR}/${P}-src
 ECONF_SOURCE=gui-wx/configure

diff --git a/app-misc/golly/golly-2.8.ebuild b/app-misc/golly/golly-2.8.ebuild
index f8a37339543..1c6a36ee52e 100644
--- a/app-misc/golly/golly-2.8.ebuild
+++ b/app-misc/golly/golly-2.8.ebuild
@@ -15,12 +15,14 @@ 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}"
+RDEPEND="${DEPEND}
+   ${PYTHON_DEPS}"
 
 S=${WORKDIR}/${P}-src
 ECONF_SOURCE=gui-wx/configure

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2017-03-04 Thread Jeroen Roovers

commit: d1bf932112b9149c4ac1d7578051dfc263155c3b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Mar  4 13:30:19 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Mar  4 13:30:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1bf9321

app-misc/golly: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-misc/golly/Manifest |  1 +
 app-misc/golly/golly-2.8.ebuild | 56 +
 2 files changed, 57 insertions(+)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index c002d0b05f1..a2446a6ad39 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1 +1,2 @@
 DIST golly-2.7-src.tar.gz 3881882 SHA256 
9af30afd7b03b3eebcfaec088d67c495609aef72516d9ca8f076b62f32b5e17b SHA512 
084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77
 WHIRLPOOL 
5c391894943593391e2c784f28c00cbbb479068936c6bd754d6c81847d4b0a3c57aad65535a5d8f5f97f789225a6d8d18f52b203ea9340fdd49f641fac8ae42e
+DIST golly-2.8-src.tar.gz 4087191 SHA256 
0488724715bae228e88d0a819d8ed311f964c70f37f228f6218bc053a1b09b28 SHA512 
bd86f685d180687814a44aa51edf4952a5af9024abb76d6b30faf1229edc86a1ba4e1f2c13f249f604d483fbde1a6db05150263450935b5bb073c155ad166a53
 WHIRLPOOL 
e42ac36a1b61c2df7ddbab6b1d99fc34547cb1856178ba8de55d0e029e5d13fadcb1ca3cc4fd3211a8e470b4568971f23e95ee64d7d33f3a424f3977aa6e293d

diff --git a/app-misc/golly/golly-2.8.ebuild b/app-misc/golly/golly-2.8.ebuild
new file mode 100644
index 000..f8a37339543
--- /dev/null
+++ b/app-misc/golly/golly-2.8.ebuild
@@ -0,0 +1,56 @@
+# 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=""
+
+DEPEND="dev-lang/perl
+   virtual/opengl
+   sys-libs/zlib
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2016-11-27 Thread Pacho Ramos

commit: d04befa5716831eef836af3d4391971c2d4b148a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 27 13:01:08 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 27 13:01:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04befa5

app-misc/golly: Drop old

Package-Manager: portage-2.3.2

 app-misc/golly/Manifest|  1 -
 app-misc/golly/golly-2.4-r1.ebuild | 44 --
 2 files changed, 45 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 2655816..c002d0b 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
-DIST golly-2.4-src.tar.gz 2612440 SHA256 
b5e4fe5dfb9f6b6a514211b31498be886012638e8aaae16a08b50bf2f6d676c4 SHA512 
7e49d72ff638c21f7bdf9de6d254e6baa4989735bdc3d9c52ec9eeacce7e9c6261d32f86b9c62478c3192d17aaba0f30994ad8e9be625dfa21de4d2b035493f9
 WHIRLPOOL 
556b4a319091f34362c66452b898c281620d0c98b71fbe9491a32e08edafea988d850287178d74cb2b2c34e12954f4fdb4477effa80e8f54aa938930383efe01
 DIST golly-2.7-src.tar.gz 3881882 SHA256 
9af30afd7b03b3eebcfaec088d67c495609aef72516d9ca8f076b62f32b5e17b SHA512 
084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77
 WHIRLPOOL 
5c391894943593391e2c784f28c00cbbb479068936c6bd754d6c81847d4b0a3c57aad65535a5d8f5f97f789225a6d8d18f52b203ea9340fdd49f641fac8ae42e

diff --git a/app-misc/golly/golly-2.4-r1.ebuild 
b/app-misc/golly/golly-2.4-r1.ebuild
deleted file mode 100644
index 5e724ab..
--- a/app-misc/golly/golly-2.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER=2.8
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 toolchain-funcs 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=""
-
-DEPEND="dev-lang/perl
-   sys-libs/zlib
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-   sed -e 's:-O2::' -i configure Makefile.{am,in} || die
-}
-
-src_configure() {
-   econf --with-perl-shlib="libperl.so"
-}
-
-src_compile() {
-   emake AR=$(tc-getAR)
-}
-
-src_install() {
-   emake docdir= DESTDIR="${D}" install
-   newicon appicon.xpm ${PN}.xpm
-   dodoc README TODO
-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2016-11-27 Thread Pacho Ramos

commit: 74112a7d2617c4b015367646c52432f190ffcc2a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 27 13:00:29 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 27 13:00:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74112a7d

app-misc/golly: amd64/x86 stable, bug #583998

Package-Manager: portage-2.3.2

 app-misc/golly/golly-2.7-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-misc/golly/golly-2.7-r1.ebuild 
b/app-misc/golly/golly-2.7-r1.ebuild
index 156ece7..298aa51 100644
--- a/app-misc/golly/golly-2.7-r1.ebuild
+++ b/app-misc/golly/golly-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-lang/perl

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2016-05-24 Thread Pacho Ramos

commit: 24cac745b7c8ffd5da7b20465650d1022c80a1f6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue May 24 18:54:14 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue May 24 19:12:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cac745

app-misc/golly: Drop old

Package-Manager: portage-2.3.0_rc1

 app-misc/golly/Manifest |  2 --
 app-misc/golly/golly-2.4.ebuild | 46 --
 app-misc/golly/golly-2.5.ebuild | 49 -
 app-misc/golly/golly-2.6.ebuild | 49 -
 app-misc/golly/golly-2.7.ebuild | 49 -
 5 files changed, 195 deletions(-)

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index eaf3147..2655816 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,4 +1,2 @@
 DIST golly-2.4-src.tar.gz 2612440 SHA256 
b5e4fe5dfb9f6b6a514211b31498be886012638e8aaae16a08b50bf2f6d676c4 SHA512 
7e49d72ff638c21f7bdf9de6d254e6baa4989735bdc3d9c52ec9eeacce7e9c6261d32f86b9c62478c3192d17aaba0f30994ad8e9be625dfa21de4d2b035493f9
 WHIRLPOOL 
556b4a319091f34362c66452b898c281620d0c98b71fbe9491a32e08edafea988d850287178d74cb2b2c34e12954f4fdb4477effa80e8f54aa938930383efe01
-DIST golly-2.5-src.tar.gz 3381010 SHA256 
b741c0b33fccdc72cd602fb5fcab099c4611d1a92d6bdd89b24d7410c28bbeac SHA512 
832d839151ecba4302444cc9a4b22c490220c433941ed806d9a0df07c7d0ea230d89ea1fbe120e8f7d9659a850916379e722c9a1765bcf22bb74964f94d8cf27
 WHIRLPOOL 
1cbabcbabe14a9dd2991fb30c6fec1e8b6cdb61f7eede3e5ed9041d74b35718804e4394be0a8bb04204eb617f28db4e26f0af50dc48d8e5cf312860941b687f5
-DIST golly-2.6-src.tar.gz 3545388 SHA256 
1fe2f983144bc895eaa1242f95c5bb49344cc0139b5c3309e6b4fa219c1f33d8 SHA512 
77a59f3f944883c1265880bc9e093abcf9490f96e1309c952aefb8e7ff2c6e4727ef17510f4181d068d3c8228ef8e192b8f0d63a08c6fa2070350d770eb3e8cd
 WHIRLPOOL 
428f813df40a6ec4b7944549e7895db9e1fbefdc2993c1b9fbfdea43301ff80fa51ef9c79b63e908d5a8d093fe9077134f2ced797a709a2cca47d491219daea4
 DIST golly-2.7-src.tar.gz 3881882 SHA256 
9af30afd7b03b3eebcfaec088d67c495609aef72516d9ca8f076b62f32b5e17b SHA512 
084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77
 WHIRLPOOL 
5c391894943593391e2c784f28c00cbbb479068936c6bd754d6c81847d4b0a3c57aad65535a5d8f5f97f789225a6d8d18f52b203ea9340fdd49f641fac8ae42e

diff --git a/app-misc/golly/golly-2.4.ebuild b/app-misc/golly/golly-2.4.ebuild
deleted file mode 100644
index bef8156..000
--- a/app-misc/golly/golly-2.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND=2
-WX_GTK_VER=2.8
-
-inherit python toolchain-funcs wxwidgets
-
-MY_P=${P}-src
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-   sys-libs/zlib
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-   python_set_active_version 2
-   python_pkg_setup
-}
-
-src_prepare() {
-   sed -e 's:-O2::' -i configure Makefile.{am,in} || die
-}
-
-src_configure() {
-   econf \
-   --with-perl-shlib="libperl.so" \
-   --with-python-shlib="$(python_get_library)"
-}
-
-src_install() {
-   emake docdir= DESTDIR="${D}" install
-   dodoc README TODO
-}

diff --git a/app-misc/golly/golly-2.5.ebuild b/app-misc/golly/golly-2.5.ebuild
deleted file mode 100644
index b944dcd..000
--- a/app-misc/golly/golly-2.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER=2.8
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils 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=""
-
-DEPEND="dev-lang/perl
-   sys-libs/zlib
-   x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-ECONF_SOURCE=gui-wx/configure
-
-src_configure() {
-   econf --with-perl-shlib="libperl.so"
-}
-
-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.6.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-misc/golly/

2015-10-17 Thread Pacho Ramos

commit: db2814bc296a7d0ecc937c14207deb833939275c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct 17 16:07:41 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct 17 16:07:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2814bc

app-misc/golly: This version also supports wxGTK:3.0 finally (#562480)

Package-Manager: portage-2.2.23

 app-misc/golly/golly-2.7-r1.ebuild | 49 ++
 1 file changed, 49 insertions(+)

diff --git a/app-misc/golly/golly-2.7-r1.ebuild 
b/app-misc/golly/golly-2.7-r1.ebuild
new file mode 100644
index 000..156ece7
--- /dev/null
+++ b/app-misc/golly/golly-2.7-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils 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=""
+
+DEPEND="dev-lang/perl
+   sys-libs/zlib
+   x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+ECONF_SOURCE=gui-wx/configure
+
+src_configure() {
+   econf --with-perl-shlib="libperl.so"
+}
+
+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
+}

56 matches

Mail list logo