1 |
commit: 1c1e14660885f544ae248ec901cd9777278e81be |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 3 03:39:15 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 3 03:59:32 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1e1466 |
7 |
|
8 |
games-action/teeworlds: revert to providing icon |
9 |
|
10 |
imagemagick can be messy with delegates and would rather not |
11 |
incur additional dependencies just to convert icons. |
12 |
|
13 |
Also add python3_10 given trivial, and remove unneeded xdg inherit. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/799623 |
16 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
17 |
|
18 |
games-action/teeworlds/Manifest | 1 + |
19 |
games-action/teeworlds/teeworlds-0.7.5-r1.ebuild | 17 ++++++++--------- |
20 |
2 files changed, 9 insertions(+), 9 deletions(-) |
21 |
|
22 |
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest |
23 |
index d8c49b839a5..dc7d42a72fc 100644 |
24 |
--- a/games-action/teeworlds/Manifest |
25 |
+++ b/games-action/teeworlds/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST teeworlds-0.7.5-src.tar.gz 8935505 BLAKE2B 40cf14e4f6d811df29a98cd51adc773021083e3474cc768998923fb6746e65b17c502d80af8e5613716dd3f12cf1e7cf840ec44b19ad8d214bd2cfa71f1871f3 SHA512 f0c55489b99b06e27298ac42adcf31e1130e7eace6f8672836e50c66c27ab0ccce5b8680c7181a2adc59e1f5808564001b5f0bc8ac7ab355ad8db71328ea7a76 |
28 |
+DIST teeworlds.png 3111 BLAKE2B c0b287b50d2155b556a227d4169656c886a47c6641ac15a40ca398ab9d4d0b0d7bf61c93037d4ad6d19ad9e638204975c5913d88928fee7333b6e360578c3692 SHA512 e3dd4754e14b4a6a6bf616b5f74c1f1c1a87b01522c8e5f9e33855f6f13c4ef65b17ef27015f97f303d00faa38b1441a73a7fe19f7be4541dee3f1a4810acb27 |
29 |
|
30 |
diff --git a/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild b/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild |
31 |
index 6eb673a5462..f3f44810030 100644 |
32 |
--- a/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild |
33 |
+++ b/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild |
34 |
@@ -3,13 +3,15 @@ |
35 |
|
36 |
EAPI=7 |
37 |
|
38 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
39 |
+PYTHON_COMPAT=( python3_{8..10} ) |
40 |
|
41 |
-inherit xdg cmake desktop python-any-r1 |
42 |
+inherit cmake desktop python-any-r1 |
43 |
|
44 |
DESCRIPTION="Online multi-player platform 2D shooter" |
45 |
HOMEPAGE="https://www.teeworlds.com/" |
46 |
-SRC_URI="https://github.com/teeworlds/teeworlds/releases/download/${PV}/teeworlds-${PV}-src.tar.gz" |
47 |
+SRC_URI=" |
48 |
+ https://github.com/teeworlds/teeworlds/releases/download/${PV}/teeworlds-${PV}-src.tar.gz |
49 |
+ https://dev.gentoo.org/~ionen/distfiles/${PN}.png" |
50 |
S="${WORKDIR}/${P}-src" |
51 |
|
52 |
LICENSE="ZLIB" |
53 |
@@ -31,9 +33,7 @@ RDEPEND=" |
54 |
dev-libs/openssl:0= |
55 |
sys-libs/zlib" |
56 |
DEPEND="${RDEPEND}" |
57 |
-BDEPEND=" |
58 |
- ${PYTHON_DEPS} |
59 |
- virtual/imagemagick-tools[png]" |
60 |
+BDEPEND="${PYTHON_DEPS}" |
61 |
|
62 |
src_configure() { |
63 |
local mycmakeargs=( |
64 |
@@ -47,10 +47,9 @@ src_configure() { |
65 |
src_install() { |
66 |
cmake_src_install |
67 |
|
68 |
- convert "other/icons/teeworlds.ico[0]" ${PN}.png || die |
69 |
- doicon -s 256 ${PN}.png |
70 |
- |
71 |
+ doicon "${DISTDIR}"/${PN}.png |
72 |
domenu other/teeworlds.desktop |
73 |
+ |
74 |
newinitd "${FILESDIR}"/${PN}-init.d ${PN} |
75 |
|
76 |
insinto /etc/${PN} |