| 1 |
commit: ecabcbb4d92ec0b3f37bcd582a2c04e324177366 |
| 2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
| 3 |
AuthorDate: Fri Jun 2 09:08:59 2017 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Fri Jun 2 09:08:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=ecabcbb4 |
| 7 |
|
| 8 |
fgcom, dhewm3: bumped to modern reality |
| 9 |
|
| 10 |
games-fps/dhewm3/dhewm3-9999.ebuild | 56 ++++++++++++++++++------------------- |
| 11 |
games-util/fgcom/fgcom-9999.ebuild | 9 +++--- |
| 12 |
2 files changed, 32 insertions(+), 33 deletions(-) |
| 13 |
|
| 14 |
diff --git a/games-fps/dhewm3/dhewm3-9999.ebuild b/games-fps/dhewm3/dhewm3-9999.ebuild |
| 15 |
index 7cd4e0c..cda76dc 100644 |
| 16 |
--- a/games-fps/dhewm3/dhewm3-9999.ebuild |
| 17 |
+++ b/games-fps/dhewm3/dhewm3-9999.ebuild |
| 18 |
@@ -1,29 +1,28 @@ |
| 19 |
-# Copyright 1999-2012 Gentoo Foundation |
| 20 |
+# Copyright 1999-2017 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
-# $Header: $ |
| 23 |
|
| 24 |
-EAPI=4 |
| 25 |
+EAPI=6 |
| 26 |
|
| 27 |
-inherit cmake-utils games git-2 |
| 28 |
+inherit cmake-utils git-r3 |
| 29 |
|
| 30 |
DESCRIPTION="A Doom 3 GPL source modification." |
| 31 |
HOMEPAGE="https://github.com/dhewm/dhewm3" |
| 32 |
-#SRC_URI="mirror://gentoo/doom3.png" |
| 33 |
EGIT_REPO_URI="https://github.com/dhewm/dhewm3.git" |
| 34 |
|
| 35 |
LICENSE="GPL-3" |
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="" |
| 38 |
-IUSE="cdinstall curl dedicated roe" |
| 39 |
+IUSE="cdinstall dedicated roe" |
| 40 |
|
| 41 |
-# TODO There declared SDL2 support... |
| 42 |
-DEPEND="virtual/jpeg |
| 43 |
+DEPEND=" |
| 44 |
+ virtual/jpeg |
| 45 |
media-libs/libogg |
| 46 |
- >=media-libs/libsdl-1.2 |
| 47 |
+ media-libs/libsdl2 |
| 48 |
media-libs/libvorbis |
| 49 |
media-libs/openal |
| 50 |
- curl? ( net-misc/curl ) |
| 51 |
- sys-libs/zlib" |
| 52 |
+ net-misc/curl |
| 53 |
+ sys-libs/zlib |
| 54 |
+" |
| 55 |
RDEPEND="${DEPEND} |
| 56 |
cdinstall? ( |
| 57 |
>=games-fps/doom3-data-1.1.1282-r1 |
| 58 |
@@ -32,19 +31,18 @@ RDEPEND="${DEPEND} |
| 59 |
|
| 60 |
CMAKE_USE_DIR="${S}/neo" |
| 61 |
|
| 62 |
-src_prepare() { |
| 63 |
- sed -i -e 's:\(${CMAKE_INSTALL_FULL_DATADIR}\)/dhewm3:\1:' neo/CMakeLists.txt |
| 64 |
-} |
| 65 |
+DATADIR=/usr/share/dhewm3 |
| 66 |
+DOCS="README.md" |
| 67 |
+ |
| 68 |
+# TODO: patch for common games-dir with roe and doom3-data |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
- # TODO There declared SDL2 support... |
| 72 |
mycmakeargs=( |
| 73 |
- "-DDEDICATED=ON" |
| 74 |
- $(cmake-utils_use_disable dedicated CORE) |
| 75 |
- $(cmake-utils_use_disable dedicated BASE) |
| 76 |
- $(cmake-utils_use_disable dedicated D3XP) |
| 77 |
- "-DCMAKE_INSTALL_BINDIR=${GAMES_BINDIR}" |
| 78 |
- "-DCMAKE_INSTALL_DATADIR=${GAMES_DATADIR}/doom3" |
| 79 |
+ -DDEDICATED=ON |
| 80 |
+ -DSDL2=ON |
| 81 |
+ -DCORE=$(usex dedicated OFF ON) |
| 82 |
+ -DBASE=$(usex dedicated OFF ON) |
| 83 |
+ -DD3XP=$(usex dedicated OFF ON) |
| 84 |
) |
| 85 |
cmake-utils_src_configure |
| 86 |
} |
| 87 |
@@ -54,22 +52,24 @@ src_compile() { |
| 88 |
} |
| 89 |
|
| 90 |
src_install() { |
| 91 |
- DOCS="README.md" cmake-utils_src_install |
| 92 |
-# newicon doom3.png ${PN}.png |
| 93 |
-# make_desktop_entry ${PN} "Doom 3 - dhewm" |
| 94 |
- prepgamesdirs |
| 95 |
+ keepdir "${DATADIR}" |
| 96 |
+ cmake-utils_src_install |
| 97 |
+ |
| 98 |
+ newicon "${CMAKE_USE_DIR}"/sys/linux/setup/image/doom3.png "${PN}".png |
| 99 |
+ make_desktop_entry "${PN}" "Doom 3 - dhewm" |
| 100 |
+ |
| 101 |
+ # TODO: roe desktop file |
| 102 |
} |
| 103 |
|
| 104 |
pkg_postinst() { |
| 105 |
- games_pkg_postinst |
| 106 |
if ! use cdinstall; then |
| 107 |
elog "You need to copy *.pk4 from either your installation media or your hard drive to" |
| 108 |
- elog "${GAMES_DATADIR}/doom3/base before running the game," |
| 109 |
+ elog "${DATADIR}/base before running the game," |
| 110 |
elog "or 'emerge games-fps/doom3-data' to install from CD." |
| 111 |
echo |
| 112 |
if use roe ; then |
| 113 |
elog "To use the Resurrection of Evil expansion pack, you also need to copy *.pk4" |
| 114 |
- elog "to ${GAMES_DATADIR}/doom3/d3xp from the RoE CD before running the game," |
| 115 |
+ elog "to ${DATADIR}/d3xp from the RoE CD before running the game," |
| 116 |
elog "or 'emerge doom3-roe' to install from CD." |
| 117 |
fi |
| 118 |
fi |
| 119 |
|
| 120 |
diff --git a/games-util/fgcom/fgcom-9999.ebuild b/games-util/fgcom/fgcom-9999.ebuild |
| 121 |
index 1f4e649..0c407b4 100644 |
| 122 |
--- a/games-util/fgcom/fgcom-9999.ebuild |
| 123 |
+++ b/games-util/fgcom/fgcom-9999.ebuild |
| 124 |
@@ -1,14 +1,13 @@ |
| 125 |
-# Copyright 1999-2012 Gentoo Foundation |
| 126 |
+# Copyright 1999-2017 Gentoo Foundation |
| 127 |
# Distributed under the terms of the GNU General Public License v2 |
| 128 |
-# $Header: $ |
| 129 |
|
| 130 |
-EAPI=4 |
| 131 |
+EAPI=6 |
| 132 |
|
| 133 |
-inherit cmake-utils git-2 |
| 134 |
+inherit cmake-utils git-r3 |
| 135 |
|
| 136 |
DESCRIPTION="A VoIP client for FlightGear" |
| 137 |
HOMEPAGE="http://fgcom.sourceforge.net/" |
| 138 |
-EGIT_REPO_URI="git://gitorious.org/fg/fgcom.git" |
| 139 |
+EGIT_REPO_URI="https://gitlab.com/flightgear-fs/Voice-Comm/fgcom.git" |
| 140 |
|
| 141 |
LICENSE="GPL-2" |
| 142 |
SLOT="0" |
Archives