[gentoo-commits] proj/gamerlay:master commit in: games-fps/dhewm3/

[Azamat H. Hackimov]

commit:     608f5ce6b879a32526697c3270f7b4b8b30bbb8f
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu Nov 15 20:41:01 2018 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> 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 <azamat.hackimov <AT> 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>azamat.hackimov@×××××.com</email>
 <name>Azamat H. Hackimov</name>
 </maintainer>
@@ -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
 </longdescription>
-<use>
-    <flag name="roe">Adds support for the Resurrection of Evil expansion</flag>
-</use>
 </pkgmetadata>