gentoo auto-resync : 21:01:2023 - 11:40:40

6 files changed, 79 insertions, 6 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1a0cbcdb57ac..b9bb4b5b1e72 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/fmawk/Manifest b/app-misc/fmawk/Manifest
index c8fa7adb1599..440f051d12d5 100644
--- a/app-misc/fmawk/Manifest
+++ b/app-misc/fmawk/Manifest
@@ -1,6 +1,6 @@
 DIST fmawk-1.2.tar.gz 23399 BLAKE2B f4c20c8f1569a6715710a5cef02a767152694ef7e216c9fe707c7ac57c20dd012189db14777d47a980008255c7f51b5c165cdf086c41835a7ce550b758a8f350 SHA512 86d56e1cc893c385a0bb338957a9ef698c0edef4587e6d3a21aa316fd996fa3b1416220e5c235d613876a3d19650e8e7a20bf991a4ce67ce9759a362d2aaac30
 DIST fmawk-1.3.tar.gz 25628 BLAKE2B e9b591941c5dbfa96414cc494b91eebfc19e9153cad7066afe216a6e1a177de5c3f3e04f09fec62bbd0adf0b3330bfc9471fcecc23b568e966e8185b7a298c39 SHA512 b1ca40c71b219cd59009c96692e1297cec75d2a61b28c330e4b80b55bde6dc6dfb071fec9dc4ae4f3e8aa7be7bbb51d444687f9500c82dba440388d41369e157
 EBUILD fmawk-1.2.ebuild 859 BLAKE2B 21dd1a6218cdad096406fc570964fa750a22b9c95eb88b8efa9572ffdf767f0d63813eacf8fafe27ecf18023c4a2857dc6cec2b41f8678de4f1ea212c96bb084 SHA512 080d7263e53b27f9c682364683041dc7afd49feefdd9b2650e0a1d1858245d7ae5a8a54e9824bd16e0066ac95083bc5e1a61790bedb1d3f05544736c2ef140da
-EBUILD fmawk-1.3.ebuild 811 BLAKE2B 283eb7d72c1cba50664983d350a887cbfd0b9984a612a6bf435421aef0d5dd37a604bc290c57ffbd5dfbe383cb26337ea7a0cb5f9868640cd7094761bb8fe510 SHA512 f9548cf1e2e489b3be45de7accd9f18a97c4fbd2f116631682613fa809eceb8ca1901dbda9851cae801c102e464ac6d7341281dc5cd441207419fb1033b51c91
+EBUILD fmawk-1.3.ebuild 810 BLAKE2B aeb6b97820b2d5c671a9b7d339dd50ab0913abaf26b06686bf0c562a4774c59c78984eb04c1382eb426ea7116b5b5e0edac04e3540d93df551b3ba7061bd878b SHA512 80bcd5baa9d783684e9a6167a55c90739680c850da8cd77ac3c5eaead54cc8657edf1c0192770340af1d01c40f23d91c5a1c957813789e91cdfd073d287f4386
 EBUILD fmawk-9999.ebuild 811 BLAKE2B 283eb7d72c1cba50664983d350a887cbfd0b9984a612a6bf435421aef0d5dd37a604bc290c57ffbd5dfbe383cb26337ea7a0cb5f9868640cd7094761bb8fe510 SHA512 f9548cf1e2e489b3be45de7accd9f18a97c4fbd2f116631682613fa809eceb8ca1901dbda9851cae801c102e464ac6d7341281dc5cd441207419fb1033b51c91
 MISC metadata.xml 758 BLAKE2B dbf30b8f5a4ad49d804ff86a0738c0822c59e277e23ea030fc8d214491bf6a094d1ab0965501649aa5c566751b19eb79a8b087446c83af833c93d61de9b75e6f SHA512 73212972218ea85709cf9de7e2707ae8b7a9676da5cb2dfa0c54c6c9ff528834c45631119306c93bdf3f1b7ff6f74dfeadc6a21277234e6665f4a1f325c50f9c
diff --git a/app-misc/fmawk/fmawk-1.3.ebuild b/app-misc/fmawk/fmawk-1.3.ebuild
index 57d3dbc7f79e..1401e88a7e30 100644
--- a/app-misc/fmawk/fmawk-1.3.ebuild
+++ b/app-misc/fmawk/fmawk-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
 else
 	SRC_URI="https://github.com/huijunchen9260/fm.awk/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/fm.awk-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index f6c5fb3a8187..808cecd8a6c8 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,6 +1,8 @@
 AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f982294f18abd5297bc0d5cbd877ece2716736ce8dfcf044c823cb707d6ce8923177b3ab2bbf09a3d0e247b92 SHA512 b883702ed44bd8469255bbc43191bbf91da64ff0048d4cc3c7cc0c5103e01fe49f9017ad1723d041ab080dfa46b68f4bab0b9abd850b74b1803d5bcebb04c36a
 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
 EBUILD golly-4.0.ebuild 1390 BLAKE2B 496a39f47a65d993dca3fa57cd7f222ceb6809b350098fa013671e45fe81732c10b449bce2c1bd74791cab87681c1ec8e2c30bd7d1d7181849e6144afd6e904a SHA512 90ea77d4e1e502aaaa7daac1eabd1bc389716036e84bbbfcb57531318e08c461c89583e94eea8767cb491122223606bc6f9ed78a22c3d38335ae1da6c9f453b9
 EBUILD golly-4.1-r1.ebuild 1411 BLAKE2B f5100628ebec553b0bb7c87f90d002216be68a758101c7336e378910f357494be97a73a67b0a027fc83efe2bfc0f3065dc1a26dfba935746a32f0b77f61b9057 SHA512 b90e1f02ed3d59e107ee412adc88ad3603c9083943314cf6cd60d01625cb85ad207acfc4153f2cfffc74a1e6621d4f124df4c6d2d62801a8822211a1c422756b
-MISC metadata.xml 510 BLAKE2B e5c5d938e4500bde38e48ec132ac3fad49f700b49f43515f1595fbdf8e9f57075489869bc12e538bf1e886626d8cced9c8503e57b370e239bb178119b27a7f27 SHA512 b208332dc47ca3b8a52e6d28e1972cc9ffb662e2340f13dd239d7837802c0517c9608cb1b99e619c9b1fab3549fe39f183cdeeb3f4279540ea7548b220a409d0
+EBUILD golly-4.2.ebuild 1483 BLAKE2B 79fda1208f2faf64a68528c7a242fe876da664a11a3ac3b457fd1d3637643bdbce9f80e86e12b9fe9e002fc0422b637d0b6583eb07ac6fbd975c88b249508839 SHA512 cca01bf0da37c8a318f2fd756bba85666acec06398923b5fa436945ab3155eb9726d7c118679ddebb568e06707875207e6cef828d3797cdd90da5c31f922699f
+MISC metadata.xml 571 BLAKE2B 64399eaf28ab52d39c1338758ca1abc2f67f195e4320b01d411d00fc3e434065d25cbab6c886dddfcd18611cef4d057c0b74c22c73e432ce1c3efb22e523164a SHA512 7ddf9bbb0cb55f5beb5377b2f0a7823e125195d0019f45dfd26c0868fe57c69913d11946de5060416856ac68bca863fd06a1a1128704a8fa53fd494df4b106e5
diff --git a/app-misc/golly/golly-4.2.ebuild b/app-misc/golly/golly-4.2.ebuild
new file mode 100644
index 000000000000..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
+}
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 @@
     <name>Maciej Barć</name>
   </maintainer>
   <longdescription>
-    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.
   </longdescription>
   <upstream>
+    <doc>https://golly.sourceforge.net/Help/index.html</doc>
     <remote-id type="sourceforge">golly</remote-id>
   </upstream>
 </pkgmetadata>