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 D9BD2138334 for ; Thu, 15 Nov 2018 21:35:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 839ADE0953; Thu, 15 Nov 2018 21:35:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 3C880E0953 for ; Thu, 15 Nov 2018 21:35:41 +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 B3D22335C58 for ; Thu, 15 Nov 2018 21:35:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CAB8B45A for ; Thu, 15 Nov 2018 21:35:37 +0000 (UTC) From: "Azamat H. Hackimov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Azamat H. Hackimov" Message-ID: <1542314461.608f5ce6b879a32526697c3270f7b4b8b30bbb8f.winterheart@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-fps/dhewm3/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-fps/dhewm3/dhewm3-1.5.0_rc1.ebuild games-fps/dhewm3/dhewm3-9999.ebuild games-fps/dhewm3/metadata.xml X-VCS-Directories: games-fps/dhewm3/ X-VCS-Committer: winterheart X-VCS-Committer-Name: Azamat H. Hackimov X-VCS-Revision: 608f5ce6b879a32526697c3270f7b4b8b30bbb8f X-VCS-Branch: master Date: Thu, 15 Nov 2018 21:35:37 +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-Archives-Salt: b0701937-1f73-40be-ab5e-9f304fd1e306 X-Archives-Hash: 2eed0127bff83b86866a951bd09611de commit: 608f5ce6b879a32526697c3270f7b4b8b30bbb8f Author: Azamat H. Hackimov gmail com> AuthorDate: Thu Nov 15 20:41:01 2018 +0000 Commit: Azamat H. Hackimov gentoo ru> CommitDate: Thu Nov 15 20:41:01 2018 +0000 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=608f5ce6 games-fps/dhewm3: bump to 1.5.0_rc1, removed live Minor fixes to metadata Signed-off-by: Azamat H. Hackimov gmail.com> Package-Manager: Portage-2.3.51, Repoman-2.3.11 ...{dhewm3-9999.ebuild => dhewm3-1.5.0_rc1.ebuild} | 43 +++++++--------------- games-fps/dhewm3/metadata.xml | 5 +-- 2 files changed, 15 insertions(+), 33 deletions(-) diff --git a/games-fps/dhewm3/dhewm3-9999.ebuild b/games-fps/dhewm3/dhewm3-1.5.0_rc1.ebuild similarity index 52% rename from games-fps/dhewm3/dhewm3-9999.ebuild rename to games-fps/dhewm3/dhewm3-1.5.0_rc1.ebuild index cda76dc..d07d8f9 100644 --- a/games-fps/dhewm3/dhewm3-9999.ebuild +++ b/games-fps/dhewm3/dhewm3-1.5.0_rc1.ebuild @@ -1,34 +1,33 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils git-r3 +inherit cmake-utils + +MY_PV=${PV/_rc/_RC} DESCRIPTION="A Doom 3 GPL source modification." HOMEPAGE="https://github.com/dhewm/dhewm3" -EGIT_REPO_URI="https://github.com/dhewm/dhewm3.git" +SRC_URI="https://github.com/dhewm/dhewm3/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="cdinstall dedicated roe" +KEYWORDS="~amd64" +IUSE="dedicated" DEPEND=" - virtual/jpeg + virtual/jpeg:0 media-libs/libogg media-libs/libsdl2 media-libs/libvorbis media-libs/openal net-misc/curl - sys-libs/zlib + sys-libs/zlib:= " -RDEPEND="${DEPEND} - cdinstall? ( - >=games-fps/doom3-data-1.1.1282-r1 - roe? ( games-fps/doom3-roe ) - )" +RDEPEND="${DEPEND}" +S="${WORKDIR}/${PN}-${MY_PV}" CMAKE_USE_DIR="${S}/neo" DATADIR=/usr/share/dhewm3 @@ -57,25 +56,11 @@ src_install() { newicon "${CMAKE_USE_DIR}"/sys/linux/setup/image/doom3.png "${PN}".png make_desktop_entry "${PN}" "Doom 3 - dhewm" - - # TODO: roe desktop file } pkg_postinst() { - if ! use cdinstall; then - elog "You need to copy *.pk4 from either your installation media or your hard drive to" - elog "${DATADIR}/base before running the game," - elog "or 'emerge games-fps/doom3-data' to install from CD." - echo - if use roe ; then - elog "To use the Resurrection of Evil expansion pack, you also need to copy *.pk4" - elog "to ${DATADIR}/d3xp from the RoE CD before running the game," - elog "or 'emerge doom3-roe' to install from CD." - fi - fi - - echo - elog "To play the game, run:" - elog " ${PN}" + elog "You need to copy *.pk4 from either your installation media or your hard drive to" + elog "${DATADIR}/base before running the game," + elog "or 'emerge games-fps/doom3-data' to install from CD." echo } diff --git a/games-fps/dhewm3/metadata.xml b/games-fps/dhewm3/metadata.xml index c1e1824..b74872d 100644 --- a/games-fps/dhewm3/metadata.xml +++ b/games-fps/dhewm3/metadata.xml @@ -1,7 +1,7 @@ - + azamat.hackimov@gmail.com Azamat H. Hackimov @@ -15,7 +15,4 @@ Compared to the original DOOM 3, the changes of dhewm 3 worth mentioning are: * A portable build system based on CMake * (Cross-)compilation with mingw-w64 - - Adds support for the Resurrection of Evil expansion -