From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E72741382C5 for ; Wed, 1 Jul 2020 10:28:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01D62E0966; Wed, 1 Jul 2020 10:28:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DAA8DE0966 for ; Wed, 1 Jul 2020 10:28:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5CE434F1EC for ; Wed, 1 Jul 2020 10:28:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 935042C4 for ; Wed, 1 Jul 2020 10:28:09 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1593599225.756334db7d87f8a52c2d48302b88c39b613d51f4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-action/teeworlds/teeworlds-0.7.5.ebuild X-VCS-Directories: games-action/teeworlds/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 756334db7d87f8a52c2d48302b88c39b613d51f4 X-VCS-Branch: master Date: Wed, 1 Jul 2020 10:28:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0b4e824f-7f7b-45a8-977f-892b64454b0c X-Archives-Hash: 32670c3398984bac48df59f98f10e287 commit: 756334db7d87f8a52c2d48302b88c39b613d51f4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 1 10:19:06 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 1 10:27:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756334db games-action/teeworlds: Up to speed with 2020: cmake.eclass, py38+39 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> games-action/teeworlds/teeworlds-0.7.5.ebuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/games-action/teeworlds/teeworlds-0.7.5.ebuild b/games-action/teeworlds/teeworlds-0.7.5.ebuild index f2e0b2da85e..7e5532fed00 100644 --- a/games-action/teeworlds/teeworlds-0.7.5.ebuild +++ b/games-action/teeworlds/teeworlds-0.7.5.ebuild @@ -3,12 +3,11 @@ EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7} ) - -inherit cmake-utils desktop python-any-r1 xdg-utils +PYTHON_COMPAT=( python3_{6,7,8,9} ) COMMIT_LANG="4ba6f824e9c34565e61340d25bc8c3cc004d40fb" COMMIT_MAPS="1d3401a37a3334e311faf18a22aeff0e0ac9ee65" +inherit cmake desktop python-any-r1 xdg-utils DESCRIPTION="Online multi-player platform 2D shooter" HOMEPAGE="https://www.teeworlds.com/" @@ -17,7 +16,7 @@ SRC_URI=" 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 - " +" LICENSE="ZLIB" SLOT="0" @@ -26,7 +25,7 @@ IUSE="debug dedicated" RDEPEND=" !dedicated? ( - app-arch/bzip2 + app-arch/bzip2:= media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/pnglite @@ -41,13 +40,13 @@ RDEPEND=" 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/ - cmake-utils_src_prepare } src_configure() { @@ -57,11 +56,11 @@ src_configure() { -DPYTHON_EXECUTABLE="${PYTHON}" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install doicon -s 256 "${PN}.png" domenu other/teeworlds.desktop newinitd "${FILESDIR}"/${PN}-init.d ${PN}