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 9A91C13835A for ; Mon, 12 Oct 2020 13:23:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 847A8E088A; Mon, 12 Oct 2020 13:23:04 +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 53A3BE088A for ; Mon, 12 Oct 2020 13:23:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 12456340BBA for ; Mon, 12 Oct 2020 13:23:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8561F36B for ; Mon, 12 Oct 2020 13:23:01 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1602508978.8a0c4010eda125d1b9df1be81b3224b995affe66.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/devilutionx/devilutionx-9999.ebuild X-VCS-Directories: games-engines/devilutionx/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8a0c4010eda125d1b9df1be81b3224b995affe66 X-VCS-Branch: master Date: Mon, 12 Oct 2020 13:23:01 +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: f426a569-9107-483a-bee4-fc4a043c750c X-Archives-Hash: bc43cdbc409ba5b880881e6afcbf7c26 commit: 8a0c4010eda125d1b9df1be81b3224b995affe66 Author: Lars Wendler gentoo org> AuthorDate: Mon Oct 12 13:22:49 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Oct 12 13:22:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0c4010 games-engines/devilutionx: Synced live ebuild Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Lars Wendler gentoo.org> games-engines/devilutionx/devilutionx-9999.ebuild | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild index 90302aa10ef..3966e9a6b14 100644 --- a/games-engines/devilutionx/devilutionx-9999.ebuild +++ b/games-engines/devilutionx/devilutionx-9999.ebuild @@ -29,7 +29,6 @@ IUSE="debug lto" RDEPEND=" dev-libs/libsodium - media-fonts/sil-charis media-libs/libsdl2[haptic] media-libs/sdl2-mixer media-libs/sdl2-ttf @@ -39,34 +38,18 @@ BDEPEND=" virtual/pkgconfig " -src_prepare() { - sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" \ - -i SourceS/config.h.in || die - sed 's/CharisSILB.ttf/CharisSIL-B.ttf/g' \ - -i SourceX/DiabloUI/fonts.h || die - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DASAN="OFF" -DDEBUG="$(usex debug)" + -DDISABLE_LTO="$(usex !lto)" -DDIST="ON" - -DFASTER="OFF" - -DLTO="$(usex lto)" -DUBSAN="OFF" ) cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}/${PN}" - local size - for size in 32 48 ; do - newicon -s ${size} Packaging/resources/Diablo_${size}.png ${PN}.png - done - make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png" + # Build system still doesn't reliably set release version in the build + sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die } pkg_postinst() {