gentoo resync : 15.06.2021

12 files changed, 216 insertions, 134 deletions

diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 4bb76b50c6b4..25b88fdf7e6b 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/tuxmath/Manifest b/games-kids/tuxmath/Manifest
index e97dfb6fc7bb..0042df9e1b5b 100644
--- a/games-kids/tuxmath/Manifest
+++ b/games-kids/tuxmath/Manifest
@@ -1,3 +1,5 @@
+AUX tuxmath-2.0.3-blits-to-tmblits.patch 1183 BLAKE2B fa2eeca9c40380a2efd374cbb191957cd363d15f47c688579fbaad288ece0b4100241422f4a4b979ba4025511bdbc9263180f326617c34fe57877bf2464458a7 SHA512 6b510abdb6570cbedebf54208dcc08574b37d6d2c1cb49d165e533e0a2a634c159386fb2af8d46d7d72eae26eecbb8165b6586433bdd1f8a4f1b91a33e3ca2ca
+AUX tuxmath-2.0.3-fno-common.patch 232 BLAKE2B daef36fd30ea734a3d1ae84550009926d4bbdf31f60492d38bc60db39758ca3a2fe548ca5bf17b67552fd0a63374edf132b8600fcb37cd3389fc3dc013f8c26e SHA512 6dd76127b9fc14db689904e05d479460886a85e3bdcc056ba32b5b79a865e18631621923e709434765db49c736779c0a1345c345a2ad6ffd2834042d48322fa9
 DIST tuxmath_2.0.3.orig.tar.gz 10396696 BLAKE2B bd060178e1acf62a36da380b9212e72549fde8f6e680d6ca3a4bbee3a0db163ae96a2df2a26d03bad96bf9fc297a6de5c6b0135b4be98ebacc325e1aff5ffbdf SHA512 dd7af90f3b1bd637f2f1639a3877d1a9950c95e60b1a71633998e2b0a654bb8015c4bf83540a9af092fe054d468035d0de5f3ddc7d54b17c3235f794a6108fbe
-EBUILD tuxmath-2.0.3-r1.ebuild 1257 BLAKE2B 7a86a39eca2d9b280cc981db21f19c4e66a20e0c14ccb7097a2121c0553897425cdbda296c90a894f86f0408a8ec68a4ba4601c129ffafff59ff8cb70c0031c3 SHA512 659371a77325e474b14ff5cb59ac7f257b89d7d065c438efd1057699d24139ce2435b226e9021d8015767641da2901665ee4b6668f0400e34fdc0de8ec554a85
+EBUILD tuxmath-2.0.3-r2.ebuild 1365 BLAKE2B 430004d84633fd30895e8ecca8af387e862e5912df0e8644021d736f02afa5272325a12c945dcaee610be60571638372f112819ca0c93ff5177750a77f0d1a8d SHA512 56c77d496b73f9afe5b62539983c74e74c761b2b36ee96b39bf7fb6907383386dde8a91874e330acd63b5f4c723409f6079485b5a938643a14712483f463f373
 MISC metadata.xml 386 BLAKE2B 7dfebc426afb7fa3073cdcb11c90ed3a2f42cb40dab13e50fa66bcb40b77beab71a2cae73cd3311ba37fa898b905674e9f868f56eb1ee9232ea4bfa5db7dcadc SHA512 7964e4fb65b8dedcbeee8612a9131775db05dd111838b1b07864adf739c228aa9f2df43a26ad6fe46c27a71ab3c2bfeb3540e9e6b7627968eae94f69d946ac76
diff --git a/games-kids/tuxmath/files/tuxmath-2.0.3-blits-to-tmblits.patch b/games-kids/tuxmath/files/tuxmath-2.0.3-blits-to-tmblits.patch
new file mode 100644
index 000000000000..ff6e875d62f0
--- /dev/null
+++ b/games-kids/tuxmath/files/tuxmath-2.0.3-blits-to-tmblits.patch
@@ -0,0 +1,36 @@
+Fixes immediate crash on titlescreen with gcc10+
+Patch from debian:
+https://bugs.debian.org/986623
+--- a/src/titlescreen.c
++++ b/src/titlescreen.c
+@@ -57,3 +57,3 @@
+     unsigned char type;
+-} blits[MAX_UPDATES];
++} tmblits[MAX_UPDATES];
+ 
+@@ -1021,4 +1021,4 @@
+     for (i = 0; i < MAX_UPDATES; ++i) {
+-	blits[i].srcrect = &srcupdate[i];
+-	blits[i].dstrect = &dstupdate[i];
++	tmblits[i].srcrect = &srcupdate[i];
++	tmblits[i].dstrect = &dstupdate[i];
+     }
+@@ -1034,4 +1034,4 @@
+     for (i = 0; i < numupdates; i++)
+-	if (blits[i].type == 'E')
+-	    SDL_LowerBlit(blits[i].src, blits[i].srcrect, screen, blits[i].dstrect);
++	if (tmblits[i].type == 'E')
++	    SDL_LowerBlit(tmblits[i].src, tmblits[i].srcrect, screen, tmblits[i].dstrect);
+     //        SNOW_erase();
+@@ -1040,4 +1040,4 @@
+     for (i = 0; i < numupdates; i++)
+-	if (blits[i].type == 'D')
+-	    SDL_BlitSurface(blits[i].src, blits[i].srcrect, screen, blits[i].dstrect);
++	if (tmblits[i].type == 'D')
++	    SDL_BlitSurface(tmblits[i].src, tmblits[i].srcrect, screen, tmblits[i].dstrect);
+     //        SNOW_draw();
+@@ -1069,3 +1069,3 @@
+ 
+-    update = &blits[numupdates++];
++    update = &tmblits[numupdates++];
+ 
diff --git a/games-kids/tuxmath/files/tuxmath-2.0.3-fno-common.patch b/games-kids/tuxmath/files/tuxmath-2.0.3-fno-common.patch
new file mode 100644
index 000000000000..ffd711f21ce0
--- /dev/null
+++ b/games-kids/tuxmath/files/tuxmath-2.0.3-fno-common.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/795069
+https://github.com/tux4kids/tuxmath/pull/15
+--- a/src/menu_lan.c
++++ b/src/menu_lan.c
+@@ -39,3 +39,2 @@
+ /* lan_player_type now defined in network.h */
+-lan_player_type lan_player_info[MAX_CLIENTS];
+ 
diff --git a/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild b/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
deleted file mode 100644
index 2ef1bded85da..000000000000
--- a/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-MY_PN="${PN}_w_fonts"
-DESCRIPTION="Educational arcade game where you have to solve maths problems"
-HOMEPAGE="https://github.com/tux4kids/tuxmath"
-SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls svg"
-
-RDEPEND="dev-games/t4k-common[svg?]
-	dev-libs/libxml2:2
-	media-libs/libsdl:0[video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod]
-	media-libs/sdl-net
-	media-libs/sdl-pango
-	nls? ( virtual/libintl )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	default
-
-	sed -i -e '/\bdoc\b/d' Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		$(use_enable nls) \
-		$(usex svg "" "--without-rsvg")
-}
-
-src_install() {
-	default
-	doicon -s scalable data/images/icons/${PN}.svg
-	make_desktop_entry ${PN} "TuxMath"
-	dodoc doc/{README,TODO,changelog}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-kids/tuxmath/tuxmath-2.0.3-r2.ebuild b/games-kids/tuxmath/tuxmath-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..fb3e676b0cf5
--- /dev/null
+++ b/games-kids/tuxmath/tuxmath-2.0.3-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature
+
+DESCRIPTION="Educational arcade game where you have to solve maths problems"
+HOMEPAGE="https://www.tux4kids.com/"
+SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.orig.tar.gz"
+S="${WORKDIR}/${PN}_w_fonts-${PV}"
+
+LICENSE="CC-BY-SA-3.0 CC-PD GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls svg"
+
+RDEPEND="
+	>=dev-games/t4k-common-0.1.1-r1[svg?]
+	dev-libs/libxml2:2
+	media-libs/libsdl[video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer
+	media-libs/sdl-net
+	nls? ( virtual/libintl )"
+DEPEND="
+	${RDEPEND}
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-blits-to-tmblits.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	local econfargs=(
+		$(use_enable nls)
+		$(usex svg '' --without-rsvg)
+	)
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	doicon data/images/icons/${PN}.svg
+	domenu ${PN}.desktop
+
+	# bundled fonts are unused if t4k-common uses pango
+	rm -r "${ED}"/usr/share/${PN}/fonts || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING_GPL3,GPL_VERSIONS,INSTALL,OFL,README_DATA_LICENSES} || die
+}
+
+pkg_postinst() {
+	optfeature "music support" "media-libs/sdl-mixer[mod,vorbis]"
+}
diff --git a/games-kids/tuxtype/Manifest b/games-kids/tuxtype/Manifest
index 9505cfcc1252..93ba077bdee6 100644
--- a/games-kids/tuxtype/Manifest
+++ b/games-kids/tuxtype/Manifest
@@ -1,4 +1,6 @@
 AUX tuxtype-1.8.3-games-group.patch 399 BLAKE2B cab96cc3bd314e077847a14ac8cf7925eb5a7e02092520d8bd57bf1ce0a7a38551c536105c1b42649700ed9e6ded0136715ce7f80c979a00044479e5fd75bb6c SHA512 e18350f580adc54c73852ff5a2a086680b41fa7cd3a88b4b0c1889f8fed138e573fcbb359f376d0bae9b5bf4d8a9eff0ed02325211b259ded25b75eaf226d77f
+AUX tuxtype-1.8.3-missing-text.patch 634 BLAKE2B 54d7552b2eff4d962b33f9d644285f078002b90c0d3e1b2ca5faee24b1b444cd7a22e27235e36630001815720e6db3bd8c01860c54d0e2b8fa464c2eba07a787 SHA512 8f72a9d87e48494dc2de87bde6187b3f1d12f33f198f12e4ad3b9378d20fe95f6587f00551c0d3f151705db0a09dc42e18d415d1a4b588d5c361c0396fc18e54
+AUX tuxtype-1.8.3-t4kcommon.patch 663 BLAKE2B 789eebbe6c169c7bbbd1f48ee35daf873be0d2861e12829adf62d6fc601afb68c4824ca336b7235f6485817aee3a6a6e772c6e8942a112c614c5c1cc94aca8b6 SHA512 9c4e3094408bd5901eaa6275e6cecd98c9ce0051d24f95e8a3f52123e91c1de92b214b5e32a199502d5cb8c9e0b21c09683773671025fb13d94cb09c54a5e4f2
 DIST tuxtype-1.8.3.tar.gz 11805625 BLAKE2B f34b2386234001452a3aba8afda7206a6bf674e6e60d5e5a8ea889e462f6979615f46bd47d62353c75e814c785e6a2ce97728f8cef6c44e43bb799b633ca0175 SHA512 7638cf7b5cb3a02072d36b43d385e43797bb846c5a69fda532432fb80ece19c44ca7b9b54bd73d4d3b7462b18f90cadb4648ed82a1d9e4822d7f3bd2c7a89343
-EBUILD tuxtype-1.8.3-r1.ebuild 1430 BLAKE2B cee248da685292da250d1e2c2424c2cdbfa0c5299e1515559af88177a652ee21c4704997e08809787111431aa3f474352b773f6be8e9ae41b8eda057b85d83d2 SHA512 1528cdb4a4a8df6d16f095f40005937a7c25dc1f602eced964938629194d397d6eac80ca71ceb237714100e9507f0efdc9abd04a2b85cb00345d561100b0b211
-MISC metadata.xml 469 BLAKE2B a30509733c90ab2eaaf0f4f7b0393efd71daffeba9f806b9c7339f47398055805e86d17fe435bf3ca35f142fb224fd8819fcbe0f8136298559a544864d928687 SHA512 4d43ea7425bc9911f5b8b6ae46ded3fbe21fbefcea2e00a7a60274fa0b6b8fe1544ec2fcb4b533654a6abdb2fb6e4cd7c79494ba8cd02dbc2ad4d76c16ba5eda
+EBUILD tuxtype-1.8.3-r2.ebuild 1606 BLAKE2B 9352969c32e3a3f6d943bb69e6b3afe0ef755e8cc546b8fd6c15f6cc7f1faacf735cb201c67eb5a3cb1f13f6570a404396bb3a554e888360d9f18e6d95572340 SHA512 ea9acc998838f2cd249ce01435171ea67d569c2b9d2192ea6d2da5516b7a7b1cfc13fdc3e0e8c9743fa54fa679953ad84eb42bfd3ea3aa373134d67cee0e04b1
+MISC metadata.xml 334 BLAKE2B 6f4e62b0dbebab5c82703fda8a4aa7c796d282025d649e14416516e8ab94708342795dd9a9c70d6dd62590eda3822c51068dc4592691f8034eeaf1333451ff95 SHA512 12a1bc978d61fb759e63526aa05eea9efe60d269d0a2d52a37c4c72be7ddb0aa1e1eb0a9d76b2f0b1e91772ab50ed1a72dc9c0e486705fc51d79aed6fb786c69
diff --git a/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch b/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch
new file mode 100644
index 000000000000..9553cfa89843
--- /dev/null
+++ b/games-kids/tuxtype/files/tuxtype-1.8.3-missing-text.patch
@@ -0,0 +1,15 @@
+Fix some missing (transparent) text with libsdl-1.2.15_p20210224.
+Same issue as t4k-common-0.1.1 given tuxtype shares the same
+code and wasn't migrated to support the separate library yet.
+--- a/src/SDL_extras.c
++++ b/src/SDL_extras.c
+@@ -1297,3 +1297,3 @@
+   /* Use color key for eventual transparency: */
+-  color_key = SDL_MapRGB(bg->format, 01, 01, 01);
++  color_key = SDL_MapRGBA(bg->format, 01, 01, 01, 0xff);
+   SDL_FillRect(bg, NULL, color_key);
+@@ -1344,3 +1344,3 @@
+   SDL_SetColorKey(bg, SDL_SRCCOLORKEY|SDL_RLEACCEL, color_key);
+-  out = SDL_DisplayFormatAlpha(bg);
++  out = SDL_DisplayFormat(bg);
+   SDL_FreeSurface(bg);
diff --git a/games-kids/tuxtype/files/tuxtype-1.8.3-t4kcommon.patch b/games-kids/tuxtype/files/tuxtype-1.8.3-t4kcommon.patch
new file mode 100644
index 000000000000..14ded5619041
--- /dev/null
+++ b/games-kids/tuxtype/files/tuxtype-1.8.3-t4kcommon.patch
@@ -0,0 +1,20 @@
+This was added ahead of time (for next version), currently unused.
+--- a/configure.ac
++++ b/configure.ac
+@@ -249,16 +249,4 @@
+ dnl libt4kcommon is now required: --------------------------------------------
+ 
+-PKG_CHECK_MODULES([T4K_COMMON],
+-	[t4k_common],
+-	[],
+-	[AC_MSG_NOTICE([t4k_common not located by pkg-config, checking with AC CHECK LIB:])
+-	 AC_CHECK_LIB([t4k_common],
+-		[InitT4KCommon],
+-		[],
+-		[AC_MSG_ERROR([libt4k_common is required: git://git.debian.org/tux4kids/t4kcommon.git])])])
+-
+-AC_DEFINE([HAVE_LIBT4K_COMMON],[1],[Define to 1 if you have the `t4k_common` library])
+-CFLAGS="$CFLAGS $T4K_COMMON_CFLAGS"
+-LIBS="$LIBS $T4K_COMMON_LIBS"
+ 
+ 
diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml
index edb3136e7016..52de2ed0b372 100644
--- a/games-kids/tuxtype/metadata.xml
+++ b/games-kids/tuxtype/metadata.xml
@@ -8,7 +8,4 @@
 	<upstream>
 		<remote-id type="github">tux4kids/tuxtype</remote-id>
 	</upstream>
-	<use>
-		<flag name="pango">Render fonts using <pkg>media-libs/sdl-pango</pkg> instead of <pkg>media-libs/sdl-ttf</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild b/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild
deleted file mode 100644
index ecbbdaebb72a..000000000000
--- a/games-kids/tuxtype/tuxtype-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Typing tutorial with lots of eye-candy"
-HOMEPAGE="https://github.com/tux4kids/tuxtype"
-SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pango svg"
-
-DEPEND="acct-group/gamestat
-	dev-games/t4k-common
-	media-libs/libsdl[video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	!pango? ( media-libs/sdl-ttf )
-	pango? ( media-libs/sdl-pango )
-	svg? ( gnome-base/librsvg:2 )"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-upstream-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.3-games-group.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Fix broken linkage due to incorrect variable casing.
-	sed -i 's:$SDL_TTF:$SDL_ttf:g' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		$(use_with pango sdlpango) \
-		$(use_with svg rsvg) \
-		--without-sdlnet # Unused!
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	rm -v "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,INSTALL} || die
-	keepdir /etc/${PN} /var/lib/${PN}/words
-
-	newicon -s 64 icon.png ${PN}.png
-	make_desktop_entry ${PN} TuxTyping
-
-	fowners root:gamestat /var/lib/${PN} /usr/bin/${PN}
-	fperms 660 /var/lib/${PN}
-	fperms 2755 /usr/bin/${PN}
-}
diff --git a/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild b/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
new file mode 100644
index 000000000000..5c8cb51013e7
--- /dev/null
+++ b/games-kids/tuxtype/tuxtype-1.8.3-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop optfeature
+
+DESCRIPTION="Typing tutorial with lots of eye-candy"
+HOMEPAGE="https://www.tux4kids.com/"
+SRC_URI="https://github.com/tux4kids/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-upstream-${PV}"
+
+LICENSE="CC-BY-3.0 CC-BY-SA-3.0 GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer
+	media-libs/sdl-pango"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-games-group.patch
+	"${FILESDIR}"/${P}-missing-text.patch
+	"${FILESDIR}"/${P}-t4kcommon.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		# these are a placeholder for future features, i.e. not useful for now
+		--without-rsvg
+		--without-sdlnet
+	)
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install # skip einstalldocs, wrong files
+
+	keepdir /etc/${PN} /var/lib/${PN}
+
+	fowners :gamestat /var/lib/${PN} /usr/bin/${PN}
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/lib/${PN}
+
+	newicon icon.png ${PN}.png
+	domenu ${PN}.desktop
+
+	# bundled fonts are unused if sdl-pango is enabled
+	rm -r "${ED}"/usr/share/${PN}/fonts || die
+	rm "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING,OFL,INSTALL} || die
+	rmdir "${ED}"/var/lib/${PN}/words || die
+}
+
+pkg_postinst() {
+	# mod detection fails if using modplug over mikmod
+	optfeature "music support" "media-libs/sdl-mixer[mod,mikmod,vorbis]"
+}