commit: ecabcbb4d92ec0b3f37bcd582a2c04e324177366 Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> AuthorDate: Fri Jun 2 09:08:59 2017 +0000 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> CommitDate: Fri Jun 2 09:08:59 2017 +0000 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=ecabcbb4
fgcom, dhewm3: bumped to modern reality games-fps/dhewm3/dhewm3-9999.ebuild | 56 ++++++++++++++++++------------------- games-util/fgcom/fgcom-9999.ebuild | 9 +++--- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/games-fps/dhewm3/dhewm3-9999.ebuild b/games-fps/dhewm3/dhewm3-9999.ebuild index 7cd4e0c..cda76dc 100644 --- a/games-fps/dhewm3/dhewm3-9999.ebuild +++ b/games-fps/dhewm3/dhewm3-9999.ebuild @@ -1,29 +1,28 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI=4 +EAPI=6 -inherit cmake-utils games git-2 +inherit cmake-utils git-r3 DESCRIPTION="A Doom 3 GPL source modification." HOMEPAGE="https://github.com/dhewm/dhewm3"; -#SRC_URI="mirror://gentoo/doom3.png" EGIT_REPO_URI="https://github.com/dhewm/dhewm3.git"; LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="cdinstall curl dedicated roe" +IUSE="cdinstall dedicated roe" -# TODO There declared SDL2 support... -DEPEND="virtual/jpeg +DEPEND=" + virtual/jpeg media-libs/libogg - >=media-libs/libsdl-1.2 + media-libs/libsdl2 media-libs/libvorbis media-libs/openal - curl? ( net-misc/curl ) - sys-libs/zlib" + net-misc/curl + sys-libs/zlib +" RDEPEND="${DEPEND} cdinstall? ( >=games-fps/doom3-data-1.1.1282-r1 @@ -32,19 +31,18 @@ RDEPEND="${DEPEND} CMAKE_USE_DIR="${S}/neo" -src_prepare() { - sed -i -e 's:\(${CMAKE_INSTALL_FULL_DATADIR}\)/dhewm3:\1:' neo/CMakeLists.txt -} +DATADIR=/usr/share/dhewm3 +DOCS="README.md" + +# TODO: patch for common games-dir with roe and doom3-data src_configure() { - # TODO There declared SDL2 support... mycmakeargs=( - "-DDEDICATED=ON" - $(cmake-utils_use_disable dedicated CORE) - $(cmake-utils_use_disable dedicated BASE) - $(cmake-utils_use_disable dedicated D3XP) - "-DCMAKE_INSTALL_BINDIR=${GAMES_BINDIR}" - "-DCMAKE_INSTALL_DATADIR=${GAMES_DATADIR}/doom3" + -DDEDICATED=ON + -DSDL2=ON + -DCORE=$(usex dedicated OFF ON) + -DBASE=$(usex dedicated OFF ON) + -DD3XP=$(usex dedicated OFF ON) ) cmake-utils_src_configure } @@ -54,22 +52,24 @@ src_compile() { } src_install() { - DOCS="README.md" cmake-utils_src_install -# newicon doom3.png ${PN}.png -# make_desktop_entry ${PN} "Doom 3 - dhewm" - prepgamesdirs + keepdir "${DATADIR}" + cmake-utils_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() { - games_pkg_postinst if ! use cdinstall; then elog "You need to copy *.pk4 from either your installation media or your hard drive to" - elog "${GAMES_DATADIR}/doom3/base before running the game," + 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 ${GAMES_DATADIR}/doom3/d3xp from the RoE CD before running the game," + elog "to ${DATADIR}/d3xp from the RoE CD before running the game," elog "or 'emerge doom3-roe' to install from CD." fi fi diff --git a/games-util/fgcom/fgcom-9999.ebuild b/games-util/fgcom/fgcom-9999.ebuild index 1f4e649..0c407b4 100644 --- a/games-util/fgcom/fgcom-9999.ebuild +++ b/games-util/fgcom/fgcom-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI=4 +EAPI=6 -inherit cmake-utils git-2 +inherit cmake-utils git-r3 DESCRIPTION="A VoIP client for FlightGear" HOMEPAGE="http://fgcom.sourceforge.net/"; -EGIT_REPO_URI="git://gitorious.org/fg/fgcom.git" +EGIT_REPO_URI="https://gitlab.com/flightgear-fs/Voice-Comm/fgcom.git"; LICENSE="GPL-2" SLOT="0"
