gentoo resync : 05.12.2021

3 files changed, 82 insertions, 5 deletions

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 97dd981d06d2..1d5fd4050b64 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD golly-4.0.ebuild 1384 BLAKE2B 2957836bae7ffc4c2a17e6f5183dae6b7cd2d3a898a0fa823ad32f22f79e143bf943da5548f0bae315ec1fdb52cf11d9a937db207329eff34149fa6f2d3a358f SHA512 36750dd133c0d2dfbd203b58cc9162e164f773c14af0bc3d0a679bfc13f358fee9f778191fdf8428aa35cb6481087266c1b640c610a5670ce1189c966e91dde8
-MISC metadata.xml 243 BLAKE2B cc71d8a61768bc35e1d40dcf4bb0dfcf2f9ced6d2baad808c9bf28da0965e3a928fe61156ddf5e7c79fd3184b748500ed4f8514c1ea9fbd560003a4b3721bc1a SHA512 14aee5e4212dad88784b789507ea3bb2da083508e5bff21f6c4e505cadca9c4740aa5aa6e8bc3323d42dd4e8f095481c2b16c05b49946b4b49ab0f9ebf62d360
+EBUILD golly-4.1-r1.ebuild 1407 BLAKE2B 1762facc273ea881a859f99dc857b0c71fd958038dc2cc24a32fa2d00bfcef24dc0ea5b5024b896374e24e56595d962211d69d95fe96a984c61c992923b532c5 SHA512 29d004bca1fa573df9d6959b0300606546426fc4c7a4f9457e49ffd8378f0a8bf20f5ff3e05a74f2ed4dad22908f2bb8e047d04a6a9265f61bc792e4ea942857
+MISC metadata.xml 510 BLAKE2B e5c5d938e4500bde38e48ec132ac3fad49f700b49f43515f1595fbdf8e9f57075489869bc12e538bf1e886626d8cced9c8503e57b370e239bb178119b27a7f27 SHA512 b208332dc47ca3b8a52e6d28e1972cc9ffb662e2340f13dd239d7837802c0517c9608cb1b99e619c9b1fab3549fe39f183cdeeb3f4279540ea7548b220a409d0
diff --git a/app-misc/golly/golly-4.1-r1.ebuild b/app-misc/golly/golly-4.1-r1.ebuild
new file mode 100644
index 000000000000..b502a58b492a
--- /dev/null
+++ b/app-misc/golly/golly-4.1-r1.ebuild
@@ -0,0 +1,67 @@
+# 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
+		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
+}
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">golly</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <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.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">golly</remote-id>
+  </upstream>
 </pkgmetadata>