summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhaarp <main.haarp@gmail.com>2017-06-08 10:46:50 +0200
committerhaarp <main.haarp@gmail.com>2017-06-08 11:03:01 +0200
commit2d8e5888101e1bce45faf678175ce991cf0c4a56 (patch)
tree52d2f80ae602449a28bfffe2e8b3c1b70455271b /games-fps
parentAdd ec_access ebuild (diff)
downloadhaarp-2d8e5888101e1bce45faf678175ce991cf0c4a56.tar.gz
haarp-2d8e5888101e1bce45faf678175ce991cf0c4a56.tar.bz2
haarp-2d8e5888101e1bce45faf678175ce991cf0c4a56.zip
Bump gzdoom
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/gzdoom/Manifest4
-rw-r--r--games-fps/gzdoom/gzdoom-3.1.0.ebuild (renamed from games-fps/gzdoom/gzdoom-3.0.0.ebuild)21
2 files changed, 17 insertions, 8 deletions
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index ab4f2b0..dfed769 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1,2 @@
-DIST gzdoom-g3.0.0.zip 7483619 SHA256 5ece26743022837c8cff2a28a9eda6dc25b806a3104bf55f4c3d18a7085743b0 SHA512 40485bd9ca89b9d63293e83117a48e623d3ee3408cbd0766d6d63a6a06c27ea85876b9a20ddf4530ac140746c687d9847cde58a8d57ecfd4c89c94615cd8f002 WHIRLPOOL ad6229d113b16caaa057e50efe8c5719f1ef5e84764e52e1e217b8308cfda24cd137de83d17c4094e86c6338ced1c0c4061b42287c24249032eabcaa1254c0db
-EBUILD gzdoom-3.0.0.ebuild 1531 SHA256 eef23afebb4b9ebe4d1f1f93ae9f0f06e58cb39d10a9adc17876ed6c2ff43c8f SHA512 a3ca3a98189a8207a368aa4b6c3a177344761e67a603e2b2bbe4067a605f119ce07b88d79a180956254ea0323ef501268d6708e8aa978102de57392763a154fa WHIRLPOOL 53645e3ea398dcc07cf7bc45e83c42d4d942a2ebb70c7cce3c370ff63aabb09c4478731c246f23d17148798d409b1d5a753bc5f53e59bef66dd8d02301cfe918
+DIST gzdoom-g3.1.0.zip 10539501 SHA256 b11850f89597e9e12a8ee936731d9cf867470752dfd60a282c51960615f2f7a8 SHA512 7e3297bedc744de539bcb2e743ac738508d216b67f1bd5c13ed943d5647c4418a198b68ae477b3ba7221f4c8ae2543f614be07e899298619df45b487a46e1204 WHIRLPOOL 1834b26e79bb09b42b79a2b86c5bbf59158689d486a68652adb8a33875735ff602ba43e6b8017b3de56f4646f9191ef541cd227ed6a09cead83238de2269ce83
+EBUILD gzdoom-3.1.0.ebuild 1723 SHA256 3b925b59802e3027bef47b873fff469cbeb7c025b907686d7cb5a74df051a2b6 SHA512 339ffbfd845493e3639097977d961980229edac12f89c9912487f77b951662e65b065f47aa3591f2ab3c50b6efcae98cfb17a8c6ecaaa3a0b5708ab8824cea37 WHIRLPOOL 76a90fe6c9fe7fec5714d45cb1339dec995eab3c5a1a8674d36fdde326e20eb1a4caee9a541809100683960d16910d8c44bbbcf7a2e7a7d74325d959b0c776ce
diff --git a/games-fps/gzdoom/gzdoom-3.0.0.ebuild b/games-fps/gzdoom/gzdoom-3.1.0.ebuild
index 1ae9356..dfea00a 100644
--- a/games-fps/gzdoom/gzdoom-3.0.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-3.1.0.ebuild
@@ -1,17 +1,27 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit eutils cmake-utils
DESCRIPTION="A 3D-accelerated Doom source port based on ZDoom code"
-HOMEPAGE="https://gzdoom.drdteam.org/"
+HOMEPAGE="https://zdoom.org"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/coelckers/gzdoom.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-g${PV}.zip"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-g${PV}"
+fi
+
SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-g${PV}.zip"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
IUSE="fluidsynth +gtk3 timidity"
RDEPEND="fluidsynth? ( media-sound/fluidsynth )
@@ -25,18 +35,17 @@ RDEPEND="fluidsynth? ( media-sound/fluidsynth )
DEPEND="${RDEPEND}
|| ( dev-lang/nasm dev-lang/yasm )"
-S="${WORKDIR}/${PN}-g${PV}"
-
src_prepare() {
# Use default data path
sed -i -e "s:/usr/local/share/:/usr/share/doom-data/:" src/posix/i_system.h
sed -i -e '/SetValueForKey ("Path", "\/usr\/share\/games\/doom", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data", true);' \
src/gameconfigfile.cpp
+ eapply_user
}
src_configure() {
mycmakeargs=(
- $(cmake-utils_use_no gtk3 GTK)
+ -DNO_GTK="$(usex gtk3 no yes)"
)
cmake-utils_src_configure