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 DDB26138359 for ; Sat, 22 Aug 2020 18:56:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A092CE03EC; Sat, 22 Aug 2020 18:56:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 49256E03EC for ; Sat, 22 Aug 2020 18:56:28 +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 1C4F8340E6C for ; Sat, 22 Aug 2020 18:56:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B943832B for ; Sat, 22 Aug 2020 18:56:25 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1598122566.5d2f78d167fffec5220f4df32464501eaefecf03.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/opentyrian/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild X-VCS-Directories: games-arcade/opentyrian/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 5d2f78d167fffec5220f4df32464501eaefecf03 X-VCS-Branch: master Date: Sat, 22 Aug 2020 18:56:25 +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: b24ea13c-fe0f-4f22-bff6-507f0a895c71 X-Archives-Hash: de8bb741b7d06164c2a6ed7e8ad6a15c commit: 5d2f78d167fffec5220f4df32464501eaefecf03 Author: James Le Cuirot gentoo org> AuthorDate: Sat Aug 22 18:54:22 2020 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Aug 22 18:56:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2f78d1 games-arcade/opentyrian: More miscellaneous improvements * Depend on libsdl[video] * Delete Windows files earlier * Respect CC * Support prefix * Simplify symlink * Remove unneeded die * Clean up icon handling Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: James Le Cuirot gentoo.org> .../opentyrian/opentyrian-2.1.20130907-r2.ebuild | 32 ++++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild index fb021768080..74fce946ff8 100644 --- a/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild +++ b/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop xdg-utils +inherit desktop toolchain-funcs xdg-utils DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter" HOMEPAGE="https://github.com/opentyrian/opentyrian" @@ -14,7 +14,7 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="media-libs/libsdl +DEPEND="media-libs/libsdl[video] media-libs/sdl-net" RDEPEND="${DEPEND}" BDEPEND="app-arch/unzip" @@ -25,24 +25,32 @@ PATCHES=( "${FILESDIR}/${PV}-gcc10.patch" ) +src_prepare() { + default + rm "${WORKDIR}"/tyrian21/{*.exe,dpmi16bi.ovl,loudness.awe} || die "Failed to remove win32 binaries" +} + src_compile() { - emake DATA_PATH="/usr/share/${PN}" + emake \ + CC="$(tc-getCC)" \ + DATA_PATH="${EPREFIX}/usr/share/${PN}" } src_install() { dobin opentyrian - dosym ../../usr/bin/opentyrian /usr/bin/tyrian + dosym opentyrian /usr/bin/tyrian dodoc CREDITS NEWS README - domenu linux/opentyrian.desktop || die "Failed to install desktop file" + domenu linux/opentyrian.desktop + + local size for i in linux/icons/*.png ; do - local size=`echo ${i} | sed -e 's:.*-\([0-9]\+\).png:\1:'` - insinto /usr/share/icons/hicolor/${size}x${size}/apps - newins ${i} opentyrian.png + size=${i%.png} + size=${size##*-} + newicon -s "${size}" "${i}" opentyrian.png done - insinto "/usr/share/${PN}" - cd "${WORKDIR}/tyrian21" - rm *.exe dpmi16bi.ovl loudness.awe || die "Failed to remove win32 binaries" - doins * + + insinto /usr/share/"${PN}" + doins "${WORKDIR}"/tyrian21/* } pkg_postinst() {