gentoo resync : 03.07.2021

9 files changed, 21 insertions, 197 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index ac3a6b0ba6bb..28f84b01bc33 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/chromium-bsu/Manifest b/games-action/chromium-bsu/Manifest
index dc6e1d92912d..406c653c27aa 100644
--- a/games-action/chromium-bsu/Manifest
+++ b/games-action/chromium-bsu/Manifest
@@ -1,6 +1,3 @@
-AUX chromium-bsu-0.9.15.1-gcc6.patch 4183 BLAKE2B 33c6bbb1f3a21c62b6f693714ad215c7561637bbb9bc45172a89e8254a04b3346452ac2b7fa4e0b6c2460a05ad68d78c5011910f71bdf28ba4483d66465780c1 SHA512 dd6c35feba99ae8654840cbe433961f054412bc40b0221aa0bc0709723dd4f0ed91b35f82ed74f652ce2f9848093c861f79cefecae147a84be1705a16e1cdc2e
-DIST chromium-bsu-0.9.15.1.tar.gz 1689634 BLAKE2B c834cb5b962031a1b8d187df9a58104896a53188907e5c3e7776aa129be3ff9287c6750af3f3df2a447b86f9f67f7dc5db21dca7d6f6cdaf2a8faad619723c75 SHA512 1e62161a10a5eb4246c0e04a13e7d8b521218aa709cced5bed1440055bb91bbcff45a85e544bdc6854f1ed727ea15257d34a3c988c65818bfbfe8004ac76c104
 DIST chromium-bsu-0.9.16.1.tar.gz 1709898 BLAKE2B b89ba20756fcb5903ed45c5174a0353618fb1bb1577ddb3f525d3f2a4242744e76297ca35fe186d36687d4d7f6bbe8de2a5dca8049697d5b82059e056fd16995 SHA512 1d202c0704e16b31d93c552ae6cfc17caf1182a9ec80730a981cd99c8ca8cb64d4e6e838691aa86e17ea23b7c2c0b1e7b1f4dab91bbc6129f9bf86801f2b27c8
-EBUILD chromium-bsu-0.9.15.1-r1.ebuild 1285 BLAKE2B 16aa18c5d90449a56aecc394edb6d3acce50a9124b7613070d5b2a0dcea247ad303e1bd6e819d8ba1deb9e6b8a6416c1008a1f3cb74bce560305172b47422898 SHA512 2965e817946b29b76a4c60d177717e920ae855e6dc66b032e1930fb32769480573fee03002271b2aede02092bee30c638a95febc20ee6799a114ce4e68f64ed9
 EBUILD chromium-bsu-0.9.16.1.ebuild 1119 BLAKE2B 17992d61e4077c226a3ccaf359745b3e5171378c489051496e80f7e6dab45543b3fe8e8528c1e7288388b096dbcc29a5fff3061d3263e404878f76ec6f421a13 SHA512 9a1b94594156adbb9f6d6dc51512a41f9a820aba4a854d05b1e834101e990afac7152a9d660a043682f358510c96569a0de1d3219b10df4311733510c5bc7890
-MISC metadata.xml 484 BLAKE2B ad101206b1434b2030e28ad1c2c756c81b37613b9231f1354bb9ab329d7ecde001db56042963280333df042b8ef8c19e433737269169fe27a337cdcfc59d218c SHA512 7695d9d521352e0147da5357117ddf30ca854c2bd78948f79a6dbf5151ca482302f56a9ecc7e0384ca11d54b95623309011392bfa61753f0a17966f7bedda86f
+MISC metadata.xml 335 BLAKE2B d22cab1f941389ef9f0df16e620f329fac92e264c71509641103a8bcb87a69f806bc3eda0029a056a594625365ffa930e7d1d26307ccee896b4eabe2ab562ca8 SHA512 6eef7ef72eef43d51f717571e886ec77d868d4e9ada1b68fa5c3750c7b0838a6d0e4f7c4e5a2ec56c56f8da4302983086fc55de6212f324f77ee516f9c74efc4
diff --git a/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild b/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
deleted file mode 100644
index e1ca44d220fd..000000000000
--- a/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils
-
-DESCRIPTION="Chromium B.S.U. - an arcade game"
-HOMEPAGE="http://chromium-bsu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/chromium-bsu/${P}.tar.gz"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mixer nls +sdl"
-
-RDEPEND="
-	media-fonts/dejavu
-	media-libs/quesoglc
-	media-libs/glpng
-	virtual/opengl
-	virtual/glu
-	x11-libs/libXmu
-	mixer? ( media-libs/sdl-mixer )
-	!mixer? (
-		media-libs/freealut
-		media-libs/openal
-	)
-	nls? ( virtual/libintl )
-	sdl? (
-		media-libs/libsdl[X]
-		media-libs/sdl-image[png]
-	)
-	!sdl? ( media-libs/freeglut )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_configure() {
-	econf \
-		--disable-ftgl \
-		--enable-glc \
-		$(use_enable mixer sdlmixer) \
-		$(use_enable !mixer openal) \
-		$(use_enable nls) \
-		$(use_enable sdl) \
-		$(use_enable sdl sdlimage) \
-		$(use_enable !sdl glut)
-}
-
-src_install() {
-	default
-	dodoc data/doc/*.htm
-
-	newicon -s 64 misc/${PN}.png ${PN}.png
-	domenu misc/chromium-bsu.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch b/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch
deleted file mode 100644
index 5d3b919adf3f..000000000000
--- a/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- a/src/AudioOpenAL.cpp
-+++ b/src/AudioOpenAL.cpp
-@@ -711,7 +711,7 @@
- 	if(!file)
- 	{
- 		char	configOldFilename[256];
--		sprintf(configOldFilename, "%s/.chromium-music"CONFIG_EXT, homeDir);
-+		sprintf(configOldFilename, "%s/.chromium-music" CONFIG_EXT, homeDir);
- 		alterPathForPlatform(configOldFilename);
- 		rename(configOldFilename,configFilename);
- 		file = fopen(configFilename, "r");
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -161,7 +161,7 @@
- 	if(!homeDir)
- 		homeDir = "./";
- 
--	sprintf(configFilename, "%s/.chromium"CONFIG_EXT, homeDir);
-+	sprintf(configFilename, "%s/.chromium" CONFIG_EXT, homeDir);
- 	alterPathForPlatform(configFilename);
- 	return configFilename;
- }
---- a/src/define.h
-+++ b/src/define.h
-@@ -34,14 +34,14 @@
- 
- #ifdef macintosh
- #define CONFIG_EXT			".cfg"
--#define CONFIG_FILE			PACKAGE".cfg"
--#define CONFIG_SCORE_FILE	PACKAGE"-score.cfg"
--#define CONFIG_MUSIC_FILE	PACKAGE"-music.cfg"
-+#define CONFIG_FILE			PACKAGE ".cfg"
-+#define CONFIG_SCORE_FILE	PACKAGE "-score.cfg"
-+#define CONFIG_MUSIC_FILE	PACKAGE "-music.cfg"
- #else
- #define CONFIG_EXT
--#define CONFIG_FILE			"."PACKAGE
--#define CONFIG_SCORE_FILE	"."PACKAGE"-score"
--#define CONFIG_MUSIC_FILE	"."PACKAGE"-music"
-+#define CONFIG_FILE			"." PACKAGE
-+#define CONFIG_SCORE_FILE	"." PACKAGE "-score"
-+#define CONFIG_MUSIC_FILE	"." PACKAGE "-music"
- #endif //macintosh
- 
- #define HI_SCORE_HIST 5
---- a/src/HiScore.cpp
-+++ b/src/HiScore.cpp
-@@ -187,7 +187,7 @@
- 	const char *homeDir = getenv("HOME");
- 	if(!homeDir)
- 		homeDir = "./";
--	sprintf(configFilename, "%s/.chromium-score"CONFIG_EXT, homeDir);
-+	sprintf(configFilename, "%s/.chromium-score" CONFIG_EXT, homeDir);
- 	alterPathForPlatform(configFilename);
- 	return configFilename;
- }
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -198,7 +198,7 @@
- 
- 	if(getenv("HOME") != NULL && ((strlen(getenv("HOME"))+strlen(filename)) < 239) )
- 	{
--		sprintf(buffer, "%s/."PACKAGE"-data/%s", getenv("HOME"), filename);
-+		sprintf(buffer, "%s/." PACKAGE "-data/%s", getenv("HOME"), filename);
- 		if(stat(buffer, &sbuf) == 0) return buffer;
- 	}
- 
---- a/src/MainSDL_Event.cpp
-+++ b/src/MainSDL_Event.cpp
-@@ -19,6 +19,7 @@
- #include <cstdlib>
- #include <cstdio>
- #include <cstring>
-+#include <cmath>
- 
- #include "Config.h"
- 
-@@ -417,14 +418,14 @@
- #else
- 		Uint8 *keystate = SDL_GetKeyState(NULL);
- #endif
--		if( keystate[SDLK_LEFT]  || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs(key_speed_x)*0.4;
--		if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs(key_speed_x)*0.4;
--		if( keystate[SDLK_UP]    || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs(key_speed_y)*0.4;
--		if( keystate[SDLK_DOWN]  || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs(key_speed_y)*0.4;
--		if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; }
--		if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; }
--		if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; }
--		if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; }
-+		if( keystate[SDLK_LEFT]  || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4;
-+		if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs((int)key_speed_x)*0.4;
-+		if( keystate[SDLK_UP]    || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4;
-+		if( keystate[SDLK_DOWN]  || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs((int)key_speed_y)*0.4;
-+		if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4; key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4; }
-+		if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs((int)key_speed_x)*0.4; key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4; }
-+		if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs((int)key_speed_x)*0.4; key_speed_y += 2.0 + abs((int)key_speed_y)*0.4; }
-+		if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4; key_speed_y += 2.0 + abs((int)key_speed_y)*0.4; }
- 		//float s = (1.0-game->speedAdj)+(game->speedAdj*0.7);
- 		float s = 0.7;
- 		key_speed_x *= s;
diff --git a/games-action/chromium-bsu/metadata.xml b/games-action/chromium-bsu/metadata.xml
index a8145e90454d..2fe30fb0235b 100644
--- a/games-action/chromium-bsu/metadata.xml
+++ b/games-action/chromium-bsu/metadata.xml
@@ -5,12 +5,6 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="mixer">
-		Enables <pkg>media-libs/sdl-mixer</pkg> sound backend instead of
-		<pkg>media-libs/openal</pkg> one.
-	</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">chromium-bsu</remote-id>
 	</upstream>
diff --git a/games-action/heroes/Manifest b/games-action/heroes/Manifest
index c085bc5e5042..9a45a43da405 100644
--- a/games-action/heroes/Manifest
+++ b/games-action/heroes/Manifest
@@ -7,5 +7,6 @@ DIST heroes-0.21.tar.bz2 709079 BLAKE2B 356c7c97504c5abe6c9e94a9ba190613d199000c
 DIST heroes-data-1.5.tar.bz2 391970 BLAKE2B b4325e978955ad6cfe522055755ebcc0ff487a9fdc136dbeaea30073f450d50946859d61cf44f75ab89be556e0886f8cb6ff3623c84c3275194ac81e60b1d0f9 SHA512 a4cb1508c2010b2157dc0e1d0a7973131fa167cb1f3c93649c3bc9b2c37419e4429e33cde14f3b67c7a4670f751ff4c28d88604102780bdb1fe5c77a93e1a213
 DIST heroes-sound-effects-1.0.tar.bz2 389883 BLAKE2B cd4e889bf7e0b33eda33806040d3141576d60b93332d6c4bf7d41fd587bb9d661ded4f619e313e17d8508500e138f7f3ce08b9336818f85d9e240d2fdebaf4e2 SHA512 51da63373f1bdb2314a8c3164028ee9cbb95958bfe8f13b1119236f035282a711efcc6ef5a84fd647c1e8451b4da788a74e4b8506e1476a437299dfc7b2046d1
 DIST heroes-sound-tracks-1.0.tar.bz2 1245613 BLAKE2B b390a96065c6b127addc0bc25326c8d0055b13f896d33e765ab9a5b3c45d831c0f91e1cff361f43a2b4956e87a6a980ce2cd07d6e6588357038f92805c64dbd1 SHA512 3e7ee2890c47366a39cfc7d7b9a1e5fdf3c3379013ca96072586ba909e2a602b114c728ffbe9dfe8eb6b62232cb6c25b13475f2a33da0243ea1ffb3f040842f0
-EBUILD heroes-0.21-r3.ebuild 1584 BLAKE2B cfdee2930a0856bb3460971d3b8d267c089641fa0c5912268ff4f2e883eb7590cf56c450acee0735ab6c17a14fb467a76026ab840060d21653a83279559bc498 SHA512 b996f5228d8385725b1e24fe510fde56c9eb2dd54cf62d5ff262e13d8ee3faaff6550a18150b46fc5dd704717a1bbce87d78c875d51356f4fa791a23934abfea
+DIST heroes.png 5131 BLAKE2B f87ae50b7b6bfc3747a14fa3ca27c8e7530a369b7db989684fa8a412ef4183ffcf5f3604ecd29d9f8beefb3f3869a68e19e39d220bfa4fdf11fa434997055526 SHA512 bbc6c9673b8ef4f6e4e4930099552f3f0ee99f1ab0dde4e4afb525b9cb1260378df9562afbe714f1ea95dc48143841b53c82bec6889e9ad2694f4293b59b8f81
+EBUILD heroes-0.21-r3.ebuild 1650 BLAKE2B dd51f888d0b24d873e3b283d0faf3468a6478c898894c6b7930c03548de607d914bf68f0e14fedcd72f724d4755b852bb7dc7e6597fd219a95a026bdd7d54798 SHA512 91ce37ace65cdd648175b8ab42050a659166dab1a9f5c94ab33451d4eb0f3572f481f2335be0943725651d2b888f9ba34be9a6deb54821558d587d57b1d5aae7
 MISC metadata.xml 329 BLAKE2B 3d95771553c911350c23023422240c0a791ede2044a55bf40a25ac4c5ac84114ddb2942b370b9605a966d4dac960b1498f278394925d065bee642164f4893187 SHA512 f33d2b7d06f5e772abf4acb8b3dc8ba78b52ab8220a350ddc64d8bde67e850062830b4251f13021b8472b110602c937cfdc3fd34c97c37ba455542b771ecb872
diff --git a/games-action/heroes/heroes-0.21-r3.ebuild b/games-action/heroes/heroes-0.21-r3.ebuild
index 502043e2eb33..7920a08313c0 100644
--- a/games-action/heroes/heroes-0.21-r3.ebuild
+++ b/games-action/heroes/heroes-0.21-r3.ebuild
@@ -11,7 +11,8 @@ SRC_URI="
 	mirror://sourceforge/${PN}/${P}.tar.bz2
 	mirror://sourceforge/${PN}/${PN}-data-1.5.tar.bz2
 	mirror://sourceforge/${PN}/${PN}-sound-tracks-1.0.tar.bz2
-	mirror://sourceforge/${PN}/${PN}-sound-effects-1.0.tar.bz2"
+	mirror://sourceforge/${PN}/${PN}-sound-effects-1.0.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -60,19 +61,20 @@ src_configure() {
 	)
 
 	local pkg
-	for pkg in ${A//.tar.bz2}; do
-		cd "${WORKDIR}"/${pkg} || die
+	for pkg in ${A% *}; do
+		cd "${WORKDIR}"/${pkg%.tar.bz2} || die
 		econf "${econfargs[@]}"
 	done
 }
 
 src_install() {
 	local pkg
-	for pkg in ${A//.tar.bz2} ; do
-		emake -C "${WORKDIR}"/${pkg} DESTDIR="${D}" install
+	for pkg in ${A% *}; do
+		emake -C "${WORKDIR}"/${pkg%.tar.bz2} DESTDIR="${D}" install
 	done
 
 	einstalldocs
 
-	make_desktop_entry ${PN} Heroes applications-games
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Heroes
 }
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 81fe52263f76..4f0051466f36 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,5 +1,6 @@
 AUX teeworlds-init.d 1000 BLAKE2B 7681574d8e35583ea029b604925fa0ed3af50dafb17993e7315b2c9ff6bb83ecbe788e9745851d7763fd74018ef5ec222ba5b4a65c3b57ed0be2c7ae5b3e8b5a SHA512 01d39e8a0b5991000d336a4d51f8b61e296c0c9fce7b4247d24007b119c9c7a863e284e670b6286923a1e22fd25c4a171d20846feacea34bcc0c4d33120e98bd
 AUX teeworlds_srv.cfg 193 BLAKE2B dbbad582189f5b098e9f199dc59227ef90485e7a1bc406372d69f9985ee5a7fe39db68c52d8eb394a1c6e1320496925fa8c5474dd91204bf6e93787c2c0ba838 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5
 DIST teeworlds-0.7.5-src.tar.gz 8935505 BLAKE2B 40cf14e4f6d811df29a98cd51adc773021083e3474cc768998923fb6746e65b17c502d80af8e5613716dd3f12cf1e7cf840ec44b19ad8d214bd2cfa71f1871f3 SHA512 f0c55489b99b06e27298ac42adcf31e1130e7eace6f8672836e50c66c27ab0ccce5b8680c7181a2adc59e1f5808564001b5f0bc8ac7ab355ad8db71328ea7a76
-EBUILD teeworlds-0.7.5-r1.ebuild 1219 BLAKE2B dcc7d55f1b69b204a063e11adca65b01a27744e182456d1a7cd12923f9628cb58697efbe548a3676a9a89cb4f09a5a47559f31681f10d54b0d528a5472760ceb SHA512 6545d42db396c349773901b6bb964bade73c41b61dc3c36727dad1a240502bf8eaef19a938fd6226138767b324d4257c3e6ea547d239b86261681f34342732cc
+DIST teeworlds.png 3111 BLAKE2B c0b287b50d2155b556a227d4169656c886a47c6641ac15a40ca398ab9d4d0b0d7bf61c93037d4ad6d19ad9e638204975c5913d88928fee7333b6e360578c3692 SHA512 e3dd4754e14b4a6a6bf616b5f74c1f1c1a87b01522c8e5f9e33855f6f13c4ef65b17ef27015f97f303d00faa38b1441a73a7fe19f7be4541dee3f1a4810acb27
+EBUILD teeworlds-0.7.5-r1.ebuild 1183 BLAKE2B 5510c95996394444073a10a82f4a12ed7a7894293c24187e58cbb84778691040d7ceabe10b85ab5731ddbf197cc7067d431a81999aa9b418af212c58898d03e1 SHA512 141489df8b5805c2203f59489f77a1d2678c3bdc43e64584163dc178e5aa37f18bbb0f9cb7ba2dba2537383bb2e8ba10c5b1a31363e400a868fe9ce87f95eb11
 MISC metadata.xml 337 BLAKE2B 5858a9bda53e0846c5826c8d2b9582163b48125078b7660596b84878f4821c4eb4797fe0371c2bfd7419734ccaf3fb665e05cec49823a9f4f6e820d705476534 SHA512 add8e01d15363a41fc6e0b2f0ada8b76fcf2ce1ada63f1082d0a6b2e6b992bf9d510a93c30e20d3d8cbf590e2f69b046f5cb5dc5e9386d49cf4d1906a6b1044d
diff --git a/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild b/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild
index 6eb673a54626..f3f44810030a 100644
--- a/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild
+++ b/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit xdg cmake desktop python-any-r1
+inherit cmake desktop python-any-r1
 
 DESCRIPTION="Online multi-player platform 2D shooter"
 HOMEPAGE="https://www.teeworlds.com/"
-SRC_URI="https://github.com/teeworlds/teeworlds/releases/download/${PV}/teeworlds-${PV}-src.tar.gz"
+SRC_URI="
+	https://github.com/teeworlds/teeworlds/releases/download/${PV}/teeworlds-${PV}-src.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 S="${WORKDIR}/${P}-src"
 
 LICENSE="ZLIB"
@@ -31,9 +33,7 @@ RDEPEND="
 	dev-libs/openssl:0=
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/imagemagick-tools[png]"
+BDEPEND="${PYTHON_DEPS}"
 
 src_configure() {
 	local mycmakeargs=(
@@ -47,10 +47,9 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	convert "other/icons/teeworlds.ico[0]" ${PN}.png || die
-	doicon -s 256 ${PN}.png
-
+	doicon "${DISTDIR}"/${PN}.png
 	domenu other/teeworlds.desktop
+
 	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
 
 	insinto /etc/${PN}