summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhaarp <main.haarp@gmail.com>2020-09-20 12:28:17 +0200
committerhaarp <main.haarp@gmail.com>2020-09-20 12:28:17 +0200
commit14ce161eec8f87788d3a2816f6aa178a177c9967 (patch)
tree2ac1d86b60ec0110c0d154404ce936cbc2d14263
parentRemoving dxx-rebirth, a working ebuild is now in the Gentoo repo. (diff)
downloadhaarp-14ce161eec8f87788d3a2816f6aa178a177c9967.tar.gz
haarp-14ce161eec8f87788d3a2816f6aa178a177c9967.tar.bz2
haarp-14ce161eec8f87788d3a2816f6aa178a177c9967.zip
Fix Zandronum ebuild and update to 3.0.1
Signed-off-by: haarp <main.haarp@gmail.com>
-rw-r--r--games-fps/zandronum/Manifest4
-rw-r--r--games-fps/zandronum/zandronum-3.0.1.ebuild (renamed from games-fps/zandronum/zandronum-3.0-r3.ebuild)25
2 files changed, 13 insertions, 16 deletions
diff --git a/games-fps/zandronum/Manifest b/games-fps/zandronum/Manifest
index 07909fc..965d304 100644
--- a/games-fps/zandronum/Manifest
+++ b/games-fps/zandronum/Manifest
@@ -1,3 +1,3 @@
-DIST zandronum-3.0.tar.bz2 5495206 BLAKE2B 2d9690285a3eb6a82432e6c1dec122f3cb395780478286e9d8ffc3096b71b9bb6fbbb3f19d712f7cc13de496d46ea8fc6cd75dcd2c80101f56f201242ec55394 SHA512 55f3ce2dacc9ae6127de0feb92604668f394061a94ee473082dab8ca845410f1568a00e5543d4f4d00b028e33c866ea5f129fd226b14d419aa327e14a0e9ef56
-EBUILD zandronum-3.0-r3.ebuild 3695 BLAKE2B 279b96dcdb22edc0ed96c7f17e40252e87a99942dd6417dba0c5da7584785d1bfb65386970614b77cf4f39e67d53634c72c0ffec83461d70b97578ebde09805a SHA512 83dec953b8c218c23a793230743bd7780efb3f1f666b9c8191dac8c9df7df208520496c502a83281ae8b208bd63aab877820e2f42dcc8d7caa308d6263cb182d
+DIST zandronum-stable-10af17.tar.gz 6659250 BLAKE2B dbfb979830c06bf35ee5d4bbffd35c90acfb3e5d14351dc30dab4c36a46545a23720cfdd90b2367b84e91e7d36f9cc3377e6ab74b1dd5d2cea91419106752e57 SHA512 22c6cc2b23e5fda9b712c5783262be4f0914863b492294b66a5cffabc69d8fe74bb2813e2957b33b636014e58d8939ec20fe43eee3b7b73800e9dfd7dcd6211f
+EBUILD zandronum-3.0.1.ebuild 3824 BLAKE2B 890838bce556f3798cdcfcced93d6e09f6d0d16dfd01b315dcf76333140c5941b66d26428723a252d0b50d29b0789327854f03a22c56bcd1e7f921412a2dedb5 SHA512 f8d14cac8aeef8d0640bd41aa86cbac9e48545c8d6fbd6aa241b7cb2cfbbf41cec52862cedcec85f7ccb8bbdffb08de14af8bafc18ebd364552923fb1f434770
MISC metadata.xml 315 BLAKE2B d774a34d761497e43beb2078fc93e107b12d591b05e2439e2caaa7d1b11831151b9be6a7acf745d38ab726a887a8a4793dce11de9ec6b435e5df1db4227e748d SHA512 0e1da3132a25e09577a6861dea211f8ae941b6f4d1adbdc4b9a16c9b5bb1f9c8c96f6272a304d1b0b0a80c85965e72511203296e4f4622d1c0ba1d687f9854d2
diff --git a/games-fps/zandronum/zandronum-3.0-r3.ebuild b/games-fps/zandronum/zandronum-3.0.1.ebuild
index 1566bd6..72bf8df 100644
--- a/games-fps/zandronum/zandronum-3.0-r3.ebuild
+++ b/games-fps/zandronum/zandronum-3.0.1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=6 # compiles broken unlinked binaries on EAPI=7??
inherit cmake-utils desktop
-OWNER="Torr_Samaho"
-MY_COMMIT="dd3c3b57023f"
-MY_COMMIT_UTC_TIMESTAMP="1504266050"
+MY_COMMIT="10af17" # check tags: https://osdn.net/projects/zandronum/scm/hg/zandronum-stable/tags
+##MY_COMMIT_UTC_TIMESTAMP="1504266050"
DESCRIPTION="OpenGL ZDoom port with Client/Server multiplayer"
HOMEPAGE="https://zandronum.com/"
-SRC_URI="https://bitbucket.org/${OWNER}/${PN}/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="https://osdn.dl.osdn.net/scmarchive/g/${PN}/hg/${PN}-stable/${MY_COMMIT:0:2}/${MY_COMMIT:2}/${PN}-stable-${MY_COMMIT}.tar.gz"
LICENSE="Sleepycat"
SLOT="0"
@@ -40,17 +39,15 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 )
DEPEND="${RDEPEND}
cpu_flags_x86_mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )"
-src_unpack() {
- unpack "${P}.tar.bz2"
- S="${WORKDIR}/${OWNER}-${PN}-${MY_COMMIT}"
-}
+S="${WORKDIR}/${PN}-stable-${MY_COMMIT}"
src_prepare() {
# Normally Mercurial would generate gitinfo.h for NETGAMEVERSION
# let's do it without Mercurial
- echo "#define HG_REVISION_NUMBER ${MY_COMMIT_UTC_TIMESTAMP}" > src/gitinfo.h
- echo "#define HG_REVISION_HASH_STRING \"0\"" >> src/gitinfo.h
- echo "#define HG_TIME \"\"" >> src/gitinfo.h
+ # NOTE: not currently used for 3.0.1 as compatibility with 3.0 is hardcoded
+## echo "#define HG_REVISION_NUMBER ${MY_COMMIT_UTC_TIMESTAMP}" > src/gitinfo.h
+## echo "#define HG_REVISION_HASH_STRING \"0\"" >> src/gitinfo.h
+## echo "#define HG_TIME \"\"" >> src/gitinfo.h
# Use system libs
sed -i -e "/add_subdirectory( sqlite )/d" CMakeLists.txt
@@ -92,7 +89,7 @@ src_compile() {
fi
if use dedicated; then
BUILD_DIR="${WORKDIR}/${P}_server"
- cmake-utils_src_make SERVERONLY=1
+ cmake-utils_src_make
fi
}