commit: 4d3b79187de38d8bc6f22c38943e56a5cd3eef65 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu May 13 19:11:14 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 13 20:33:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d3b7918
games-action/teeworlds: fix outdated translation data Thanks-to: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Closes: https://bugs.gentoo.org/789741 Signed-off-by: Sam James <sam <AT> gentoo.org> games-action/teeworlds/Manifest | 5 +-- games-action/teeworlds/teeworlds-0.7.5-r1.ebuild | 47 +++++++----------------- 2 files changed, 14 insertions(+), 38 deletions(-) diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest index 08b8c1c89d4..d8c49b839a5 100644 --- a/games-action/teeworlds/Manifest +++ b/games-action/teeworlds/Manifest @@ -1,4 +1 @@ -DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8 SHA512 74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3 -DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925 SHA512 41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc -DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3 SHA512 673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b -DIST teeworlds.png 21502 BLAKE2B 8064e0c2149f20f182b2ca2f7454f0e8395e199a432b8f21a9963cc771b1504ebe8cbe427ecd738d35313b1a378eaf8e305d509cd5360a07e9ab3c5224b78b77 SHA512 a272a1d9f13504c43ba873d93899df93c435f58cec20ae68bc9493a983e54cdd4c8f0f2e0630558c5e915aec891d2267bc3459ecc78c25738602452a2123fadf +DIST teeworlds-0.7.5-src.tar.gz 8935505 BLAKE2B 40cf14e4f6d811df29a98cd51adc773021083e3474cc768998923fb6746e65b17c502d80af8e5613716dd3f12cf1e7cf840ec44b19ad8d214bd2cfa71f1871f3 SHA512 f0c55489b99b06e27298ac42adcf31e1130e7eace6f8672836e50c66c27ab0ccce5b8680c7181a2adc59e1f5808564001b5f0bc8ac7ab355ad8db71328ea7a76 diff --git a/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild b/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild index 84c2689ed33..6eb673a5462 100644 --- a/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild +++ b/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild @@ -5,18 +5,12 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -COMMIT_LANG="4ba6f824e9c34565e61340d25bc8c3cc004d40fb" -COMMIT_MAPS="1d3401a37a3334e311faf18a22aeff0e0ac9ee65" -inherit cmake desktop python-any-r1 xdg-utils +inherit xdg cmake desktop python-any-r1 DESCRIPTION="Online multi-player platform 2D shooter" HOMEPAGE="https://www.teeworlds.com/"; -SRC_URI=" - https://github.com/ktrace/gentoo-blobs/raw/master/teeworlds.png - https://github.com/teeworlds/teeworlds/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/teeworlds/teeworlds-maps/archive/${COMMIT_MAPS}.tar.gz -> ${P}-maps.tar.gz - https://github.com/teeworlds/teeworlds-translation/archive/${COMMIT_LANG}.tar.gz -> ${P}-translation.tar.gz -" +SRC_URI="https://github.com/teeworlds/teeworlds/releases/download/${PV}/teeworlds-${PV}-src.tar.gz"; +S="${WORKDIR}/${P}-src" LICENSE="ZLIB" SLOT="0" @@ -36,18 +30,10 @@ RDEPEND=" ) dev-libs/openssl:0= sys-libs/zlib" - -DEPEND="${RDEPEND} ${PYTHON_DEPS}" - -src_prepare() { - cmake_src_prepare - rm -r "${S}/datasrc/languages" || die - rm -r "${S}/datasrc/maps" || die - mv "${WORKDIR}/${PN}-translation-${COMMIT_LANG}" "${S}/datasrc/languages" || die - mv "${WORKDIR}/${PN}-maps-${COMMIT_MAPS}" "${S}/datasrc/maps" || die - cp "${DISTDIR}/${PN}.png" "${S}/" || die - python_fix_shebang scripts/ -} +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/imagemagick-tools[png]" src_configure() { local mycmakeargs=( @@ -55,25 +41,18 @@ src_configure() { -DDEV=$(usex debug ON OFF) -DPYTHON_EXECUTABLE="${PYTHON}" ) - cmake_src_configure } src_install() { cmake_src_install - doicon -s 256 "${PN}.png" + + convert "other/icons/teeworlds.ico[0]" ${PN}.png || die + doicon -s 256 ${PN}.png + domenu other/teeworlds.desktop newinitd "${FILESDIR}"/${PN}-init.d ${PN} - insinto "/etc/${PN}" - doins "${FILESDIR}"/teeworlds_srv.cfg -} -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update + insinto /etc/${PN} + doins "${FILESDIR}"/teeworlds_srv.cfg }
