gentoo resync : 12.01.2019

6 files changed, 28 insertions, 137 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 473c25fb8740..51f0c404bb78 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
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
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 58b5c4121663..0f56991204c0 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,4 @@
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.4.tar.gz 489503950 BLAKE2B 2802098a83169d1dd3d0d38052145b7da006992843d748fdc263fe04ed0f485c2a46a93569e2728e152d76361d3651f0f207d2cfdd7b6bb59ae7cdec43680cd7 SHA512 d867d68278075536c61eb87c32dd43bcd832de0dd20f9c941e2c5a2f413b95ba1897b5401721a0e895934afe79bb568ea155d8fe648dac58c519289fc7d12885
 DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e SHA512 115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e
-EBUILD wesnoth-1.14.4.ebuild 2654 BLAKE2B 9c54fb780b96f72a4bfb45db573a9ccff055b7ca8e9396244b57f5feed1d23ee0444c9dc927d971dfefc37f827ebb4d08f4fdd0131385d525eaa481d2a996d00 SHA512 dd80506c25260e2f71508eaf8657665bc9f50c6d113ef5860e7112b0e72b580829085afb45b3dbbae770679d4c3b287ea4251cb2ff559210d3c7074fbd688a00
-EBUILD wesnoth-1.14.5.ebuild 2654 BLAKE2B 9c54fb780b96f72a4bfb45db573a9ccff055b7ca8e9396244b57f5feed1d23ee0444c9dc927d971dfefc37f827ebb4d08f4fdd0131385d525eaa481d2a996d00 SHA512 dd80506c25260e2f71508eaf8657665bc9f50c6d113ef5860e7112b0e72b580829085afb45b3dbbae770679d4c3b287ea4251cb2ff559210d3c7074fbd688a00
+EBUILD wesnoth-1.14.5.ebuild 2652 BLAKE2B af84f260e5b35f7c575958b3ded2e139085ed9fd07f58fb93cf0d827abe5729a00f30aea85084878ec2a222651e18bd88e80d4fec2de9a9ba263b07ec8a2e144 SHA512 a3a503cf306139b69f0c912cf73a9d6f32e7089c0e2e44b6c9f06a13ed8df5eeb7889c9d3885884a4112a4121c1176c4e26f6d3756f48ce20e0e0ba455383d41
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild b/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
deleted file mode 100644
index 9ce29bd54b01..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		>=media-libs/sdl2-ttf-2.0.12
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0
-		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/libX11
-"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local langs
-		for lang in $(cat po/LINGUAS)
-		do
-			has $lang $LINGUAS && langs+="$lang "
-		done
-		echo "$langs" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-
-	# Work around eclass
-	append-flags -UNDEBUG
-
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
-		-DENABLE_OMP="$(usex openmp)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( README.md changelog.md )
-	cmake-utils_src_install
-	if use dedicated || use server; then
-		rmdir "${ED%/}/run/wesnothd" || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
index 9ce29bd54b01..4cd3506d2b9c 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ RDEPEND="
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
 		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0
+		sys-libs/readline:0=
 		dbus? ( sys-apps/dbus )
 		fribidi? ( dev-libs/fribidi )
 	)"