gentoo resync : 25.11.2020

4 files changed, 102 insertions, 3 deletions

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 4e432f333c1f..90509f0860ce 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -2,6 +2,9 @@ AUX golly-3.3-allow-py23-exec.patch 688 BLAKE2B d72ba8e9264f2b677818f46e94efac0b
 AUX golly-3.3-allow-py3.patch 3018 BLAKE2B ca05bc615f2bce230bb80bddcfca5d017181fba11c3117c438ec8cbff16fbd645a49b0f8f1cb3f52efb6a5c6548e2398b95167b738dfa3df36336ff43fc59d4f SHA512 409f765d7107b1f9d7df8389a57a06c7be37c050eed26f5724f24bed36fa5d93ff074d6ded991faf1c02341c726c4c8ceca268f89b64fef38f98c5c331a51f23
 AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1ccd92947e12bb1fbc97c0a074c5a347c6ff084a47085c656a94bd2add2fe14c313aff39f60174c983670be006ad9b3 SHA512 814c8a9ac2e96bf4ff61bd46b86a5ef7cfd5a4ba027fd5af78029cfbfb2b8334c76bede82770912509b0c858a2e3ff3af8258aec6e8ee328710d805d527a2863
 AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
+AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f982294f18abd5297bc0d5cbd877ece2716736ce8dfcf044c823cb707d6ce8923177b3ab2bbf09a3d0e247b92 SHA512 b883702ed44bd8469255bbc43191bbf91da64ff0048d4cc3c7cc0c5103e01fe49f9017ad1723d041ab080dfa46b68f4bab0b9abd850b74b1803d5bcebb04c36a
 DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
-EBUILD golly-3.4.ebuild 1369 BLAKE2B eec1f5eaae1aa29c1cf4a37e8e0c4f1a9ea9af1e989d9491222e311d3c7df19eac8b14ddf2c7b0269e4477b7205a197dac892d3ba22a3da7e8c1d6747f5c62bd SHA512 c913ae097775509899401c6de02e69626c13dd26e04178daa28269e1aa812f47b51e81bb289f8e937f52a9249ff3dd2e2c6076a39ec3a3115fba619e93cf571c
+DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
+EBUILD golly-3.4.ebuild 1364 BLAKE2B 4e3ec9e4fd7a5746b30dca2a01d4e3b77eb0728a56aaf7936c5ff58372461e13076bbff0755ad2e375b35f65e3d3f0abe68743a55c45da48970e33548e108cfb SHA512 88bede339f2178bcdf8f83c33813495d45e51a301abd8796c93da7a7b39a97a049079efeaddf13b61f84229efd6384ce9387b882f1bdf112153c3c67e56b34a0
+EBUILD golly-4.0.ebuild 1383 BLAKE2B 1f7c5c8aca92f0d1dbab09da3fdaa6d162cb562687a62a2ca54ff6c6176412a1571928454902011cb3569057c12fe004755d151dcdea9895763441b613dced81 SHA512 acdde6e179ee58fd81be2daf0b55475570f428cdc5c6fa6d3d4f1c73138b9998317aae6c3f6b7dcb9e09bb207964cefcf91cf8f8a3a946ee24f461ccaaf8fc37
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
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 000000000000..3ac729df93ef
--- /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-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
index 550db180b0d2..b1dcbb7f8201 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
new file mode 100644
index 000000000000..a8adfaba6a94
--- /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=""
+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
+}