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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C1D4158020 for ; Thu, 1 Dec 2022 11:02:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45553E07B3; Thu, 1 Dec 2022 11:02:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CC2FE07B3 for ; Thu, 1 Dec 2022 11:02:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DD26340EF9 for ; Thu, 1 Dec 2022 11:02:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9909476C for ; Thu, 1 Dec 2022 11:02:46 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1669892525.1fd0cd09337447564aec34510f0ccbee6f54559d.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-fps/assaultcube/assaultcube-1.3.0.2.ebuild games-fps/assaultcube/metadata.xml X-VCS-Directories: games-fps/assaultcube/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 1fd0cd09337447564aec34510f0ccbee6f54559d X-VCS-Branch: master Date: Thu, 1 Dec 2022 11:02:46 +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: 0a25bc92-ac80-4b47-8cbd-b245a8826aac X-Archives-Hash: 79edfa9711dc09bcd2810434b415d714 Message-ID: <20221201110246.Scgt0xqn0ROCS02w3YP-7-kUcNCTnP7GNTuBm24caDY@z> commit: 1fd0cd09337447564aec34510f0ccbee6f54559d Author: Florian Schmaus gentoo org> AuthorDate: Thu Dec 1 11:01:37 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Thu Dec 1 11:02:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1fd0cd09 games-fps/assaultcube: improve ebuild, add missing die etc. Signed-off-by: Florian Schmaus gentoo.org> games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 53 ++++++++++++++---------- games-fps/assaultcube/metadata.xml | 3 ++ 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild index a1169191a..0eb39ae03 100644 --- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild +++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild @@ -9,55 +9,64 @@ DESCRIPTION="Free multiplayer FPS based on the Cube engine" HOMEPAGE="https://assault.cubers.net/" SRC_URI="https://github.com/assaultcube/AC/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/AC-${PV}" + LICENSE="ZLIB assaultcube" SLOT="0" KEYWORDS="~amd64" -RDEPEND="sys-libs/zlib - media-libs/libsdl2[opengl] - media-libs/sdl2-image[jpeg,png] - x11-libs/libX11 - media-libs/libogg - media-libs/libvorbis - media-libs/openal" +IUSE="debug" + +RDEPEND=" + sys-libs/zlib + media-libs/libsdl2[opengl] + media-libs/sdl2-image[jpeg,png] + x11-libs/libX11 + media-libs/libogg + media-libs/libvorbis + media-libs/openal +" DEPEND="${RDEPEND}" BDEPEND="sys-devel/clang" PATCHES=( "${FILESDIR}/${PN}-1.3.0.2-respect-ldflags.patch" - "${FILESDIR}/${PN}-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game + # a script which checks for required libs and certain parts of the game + "${FILESDIR}/${PN}-1.3.0.2-fix-checkinstall.patch" ) -IUSE="debug" src_prepare() { default - sed -i 's|//#define PRODUCTION|#define PRODUCTION|' "${S}/source/src/cube.h" + sed -i 's|//#define PRODUCTION|#define PRODUCTION|' source/src/cube.h || die +} + +src_configure() { filter-lto } src_compile() { - cd "${S}/source/src" if use debug; then - DEBUGBUILD=1 emake - else - emake + local -x DEBUGBUILD=1 fi + emake -C source/src } src_install() { - cd "${S}/source/src" - emake install + emake -C source/src install - install -dm755 "${D}/usr/share/assaultcube" - install -Dm755 "${S}"/{assaultcube.sh,check_install.sh,server.sh,server_wizard.sh} -t "${D}/usr/share/assaultcube" - install -Dm755 "${S}"/bin_unix/native_{client,server} -t "${D}/usr/share/assaultcube/bin_unix" - cp -r "${S}"/{bot,config,demos,docs,mods,packages} "${D}/usr/share/assaultcube/" - install -Dm644 "${S}"/{CONTRIBUTING.md,GOVERNANCE.md,README.{html,md},SECURITY.md} -t "${D}/usr/share/assaultcube" + install -dm755 "${ED}/usr/share/assaultcube" || die + install -Dm755 "${S}"/{assaultcube.sh,check_install.sh,server.sh,server_wizard.sh} \ + -t "${ED}/usr/share/assaultcube" || die + install -Dm755 "${S}"/bin_unix/native_{client,server} -t "${ED}/usr/share/assaultcube/bin_unix" || die + cp -r {bot,config,demos,docs,mods,packages} "${ED}/usr/share/assaultcube/" || die + + dodoc CONTRIBUTING.md GOVERNANCE.md README.{html,md} SECURITY.md make_desktop_entry \ - "/usr/share/assaultcube/assaultcube.sh %u" \ + "${EPREFIX}/usr/share/assaultcube/assaultcube.sh %u" \ AssaultCube \ /usr/share/assaultcube/packages/misc/icon.png \ Game \ "Keywords=assaultcube;game;fps;\nMimeType=x-scheme-handler/assaultcube" + + dosym "${EPREFIX}/usr/share/assaultcube/assaultcube.sh" usr/bin/assaultcube } pkg_postinst() { diff --git a/games-fps/assaultcube/metadata.xml b/games-fps/assaultcube/metadata.xml index 62988a0d4..9c7d38989 100644 --- a/games-fps/assaultcube/metadata.xml +++ b/games-fps/assaultcube/metadata.xml @@ -5,4 +5,7 @@ duje.mihanovic@skole.hr Duje Mihanović + + assaultcube/AC +