gentoo resync : 31.01.2021

4 files changed, 4 insertions, 129 deletions

diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index a1d5f90a4ed6..67ce6eef9896 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,6 +1,5 @@
 AUX hedgewars-1.0.0-cmake_lua_version.patch 282 BLAKE2B 0a65ddbc5b69264e51b5ca6bd23a3800d8aa04ca3cb59741ed7c58b7a44b8d173c6b22f6917a57fb6c37f1199305a347099afcb806b111a8bb304ebee956766b SHA512 406d52cecded03e392dd37e3119137a47604b9fc6c72af34ee671cf4c33b93158dd727083af87763a8220cf5ff05ab8eb6366da134481c2507dc83d5c6eecb3d
 AUX hedgewars-1.0.0-qt-5.15.patch 328 BLAKE2B 9304e4e1811e2aab876b5a6c3edea584c3271c5531035bfb2a53369000a30c61264464df655396146a26e08750ee29ffd9eb25aca8f89fa91409247b69675ad1 SHA512 f45985e878c9380f4bdcf755a79f1c906bdc6a8fa243faaa15f1c73b50d7b619c461821271ae151076f631ca0aecae31ddbe00d3d97945f13afc94610e216856
 DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2
-EBUILD hedgewars-1.0.0-r1.ebuild 2613 BLAKE2B e8c230cc14735fceaab5689c2573d8896f1e84662fe1c1cfc65bb9a7d36b49d323c9930eaafbf7e96656463de23d11abce955d2f58227013e438b1cfc0a0c46a SHA512 dafaf4ab6fa9c06e3d0f7f367e9a9ea13e1341f15fa43cace46a473f558122cfa21b6d1c9e279b8119b508a39613aa827271b44959c9e664c95ed4dca9d9ce04
-EBUILD hedgewars-1.0.0-r100.ebuild 2764 BLAKE2B 5a0b19b46f0982da58fa25bf7d7291481039cef1a1c89b954bba060cd450ffd9929a27b65b1b2824d357bbf34e6a47ac9098d718e634d24318e99b6853ce90eb SHA512 e0ed15c1cbeebd7c460828bfef0ad03233f25f7891cdf2285afd00bebabc4c3c0deb7ec7897da0e04b5fdd6e1ec55638ba61a3f912f057097527057f5452a27e
-MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
+EBUILD hedgewars-1.0.0-r100.ebuild 2409 BLAKE2B c26031b96dc175489de5afd0fb898f8fba6bcb38e2b35bdaf37bd7abc10b04756d91c345814f4144ba6588474182b9e9a536006eaf7be3ffa241be27c25b9468 SHA512 19a23bbba2991eb6111c651de8b22747ff777ab4b4ffbb903d9bf9def327b62b6f76d77048903bac1678585997235a9b0230908327c47162202a16e19422e7cb
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
deleted file mode 100644
index 95f4eb1d7eb5..000000000000
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake xdg-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
-HOMEPAGE="https://www.hedgewars.org/"
-SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 Apache-2.0 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="server"
-
-QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
-QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
-
-# qtcore:5= - depends on private header
-DEPEND="
-	>=dev-games/physfs-3.0.1
-	dev-lang/lua:0=
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libpng:0=
-	media-libs/libsdl2:=
-	media-libs/sdl2-image:=
-	media-libs/sdl2-mixer:=[vorbis]
-	media-libs/sdl2-net:=
-	media-libs/sdl2-ttf:=
-	sys-libs/zlib
-	!x86? ( 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
-		dev-haskell/entropy
-		dev-haskell/hslogger
-		>=dev-haskell/mtl-2
-		>=dev-haskell/network-2.3
-		dev-haskell/random
-		dev-haskell/regex-tdfa
-		dev-haskell/sandi
-		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
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMINIMAL_FLAGS=ON
-		-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)
-		-DBUILD_ENGINE_C=$(usex x86)
-		-DNOVIDEOREC=$(usex !x86)
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		# 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
-		#   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
-		#   https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
-		-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
-		# upstream sets RPATH that leads to weird breakage
-		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doman man/${PN}.6
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
index 8f127f790724..7f1d4b6f7c5b 100644
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"
 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="server"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -46,21 +45,6 @@ RDEPEND="${DEPEND}
 	media-fonts/wqy-zenhei"
 BDEPEND="
 	dev-qt/linguist-tools:5
-	server? (
-		>=dev-lang/ghc-6.10
-		dev-haskell/entropy
-		dev-haskell/hslogger
-		>=dev-haskell/mtl-2
-		>=dev-haskell/network-2.3
-		dev-haskell/random
-		dev-haskell/regex-tdfa
-		dev-haskell/sandi
-		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
@@ -80,7 +64,7 @@ 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)
+		-DNOSERVER=TRUE
 		-DBUILD_ENGINE_C=$(usex x86)
 		-DNOVIDEOREC=$(usex !x86)
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
diff --git a/games-strategy/hedgewars/metadata.xml b/games-strategy/hedgewars/metadata.xml
index c8b942447c41..78274e0fa550 100644
--- a/games-strategy/hedgewars/metadata.xml
+++ b/games-strategy/hedgewars/metadata.xml
@@ -5,7 +5,4 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
-<use>
-	<flag name="server">Enable local server</flag>
-</use>
 </pkgmetadata>