summaryrefslogtreecommitdiff
path: root/games-strategy/hedgewars
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-01-12 16:58:08 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-01-12 16:58:08 +0000
commitc8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /games-strategy/hedgewars
parent2891d29af8907ce881662f4a02844926d7a293c7 (diff)
gentoo resync : 12.01.2019
Diffstat (limited to 'games-strategy/hedgewars')
-rw-r--r--games-strategy/hedgewars/Manifest4
-rw-r--r--games-strategy/hedgewars/hedgewars-0.9.25.ebuild (renamed from games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild)38
2 files changed, 25 insertions, 17 deletions
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index fa8bc20c4461..6f194d924cda 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,5 +1,5 @@
AUX hedgewars-0.9.22-rpath-fix.patch 677 BLAKE2B 361eac896d7c7e9b6b3fa5daf4c24214e868b2098db96445b612f5ac0a9ce3f09ec88ec7feaaa62e75be5e2f61e62e6ecae68417519b907f54e6eac051d320c4 SHA512 d4511d1d3d6da4d30e33cc12b7c12feb6cf25d1fcdaab4b09a7c4f7a2a5282826190a152e6c1609d2afab71ac001557d2a757c232382f5cd471753f8a4cee8ee
-DIST hedgewars-src-0.9.24.1.tar.bz2 175069915 BLAKE2B 5c49b91b9a77a110a7bc8667f9621c92d638950071c8db7493b7797c2e504a214052fad6ae8554d844146eecabd794529891aebf4e54ee73f8a447ab11c6c7da SHA512 b0b166c807e0d08a763e5e88e178d6e629baa420685bbfe381db7b5ecf003175892f8c2e3b75f1f6d7663335bd5b417d1a2afdc89b9d56b348b056ee3490ed2f
+DIST hedgewars-src-0.9.25.tar.bz2 175276967 BLAKE2B 8f0779ca05ffbf18f607716bbec03bf0d6633cd6c3594bcb94b78ba606ed8c36d418d7b5456574cc0a08489e143d2390ed7ebcc8637e7987231ba04c0d5b5331 SHA512 956c21a7203586485e885f98fa4eccdc2fd34b50c0f817c1f6f610af1b4f341a5bb32bb8e0ace13f78ce2fb79a489000034b89c1b56459a411c07a1809041968
DIST hedgewars_0.9.23-dfsg-2.debian.tar.xz 77488 BLAKE2B 5de6fa2ad91f1346f679d07b3b445bd119d2cdd3c715ace20fc36abe726330ccf9a9b69ec56c58cfca4cc6256ff248b0cc0b0e27caf2a79df0f1662ea7727e8e SHA512 03680446930279178ddff85a87fc27b7c26ad6d850c8f26571517ebbd6dff296db216da6b56d4bd55c659786bc5c76e2b67a63052ee38e150655e60c08f7c491
-EBUILD hedgewars-0.9.24.1.ebuild 2693 BLAKE2B ea23fac741436c809f3642818833f23ccefe362b14b4576b0f26dc156e85e2e56b1d94d87002475c7788e645f9d676a343f0abb9f741c98313fb81ba10fc4dae SHA512 710ef2dec6586ae25603552cc5a02213bcb8ff4aa5a0b3037608c9ddb39f83d6e68c90097063757e8cc69bb9fa853f7fa88fae33fad394cdee57aa08c45f7d09
+EBUILD hedgewars-0.9.25.ebuild 2794 BLAKE2B c9be8c1774be0791b6762809b188eb456383a5eaaab8bc60f7e756dc78738a54df37c62e0f1d562da22e0d77970654b8af942a8771796aafff163452a2a7fce1 SHA512 846aea392913a8c97e012d6966e0e4c021ab4e4a9e1a843cb083380d30ad0c9e971f49ffc6296572423d1e5a57593af31b688fd32843e557b7249942e91252f4
MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
diff --git a/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.25.ebuild
index 3e592af7ebfa..c98f3a05e5de 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.25.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils desktop xdg-utils
+inherit cmake-utils xdg-utils
MY_P=${PN}-src-${PV}
DEB_PATCH_VER=2
@@ -23,7 +23,7 @@ QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
# qtcore:5= - depends on private header
-CDEPEND="
+DEPEND="
>=dev-games/physfs-3.0.1
dev-lang/lua:0=
dev-qt/qtcore:5=
@@ -36,11 +36,16 @@ CDEPEND="
media-libs/sdl2-mixer:=[vorbis]
media-libs/sdl2-net:=
media-libs/sdl2-ttf:=
- sys-libs/zlib:=
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:= )"
-DEPEND="${CDEPEND}
- >=dev-lang/fpc-2.4
+ sys-libs/zlib
+ !x86? (
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:= )
+ )"
+RDEPEND="${DEPEND}
+ app-arch/xz-utils
+ >=media-fonts/dejavu-2.28
+ media-fonts/wqy-zenhei"
+BDEPEND="
dev-qt/linguist-tools:5
server? (
>=dev-lang/ghc-6.10
@@ -54,12 +59,14 @@ DEPEND="${CDEPEND}
dev-haskell/sha
dev-haskell/vector
dev-haskell/utf8-string
+ dev-haskell/yaml
>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
+ )
+ !x86? ( >=dev-lang/fpc-2.4 )
+ x86? (
+ >=dev-lang/ghc-6.10
+ dev-haskell/parsec
)"
-RDEPEND="${CDEPEND}
- app-arch/xz-utils
- >=media-fonts/dejavu-2.28
- media-fonts/wqy-zenhei"
S="${WORKDIR}"/${MY_P}
@@ -73,9 +80,10 @@ src_configure() {
-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
- -DNOSERVER=$(usex server FALSE TRUE)
+ -DNOSERVER=$(usex !server)
+ -DBUILD_ENGINE_C=$(usex x86)
+ -DNOVIDEOREC=$(usex !x86)
-DCMAKE_VERBOSE_MAKEFILE=TRUE
- -DPHYSFS_SYSTEM=ON
# Need to tell the build system where the fonts are located
# as it uses PhysFS' symbolic link protection mode which
# prevents us from symlinking the fonts into the right directory