gentoo resync : 20.11.2017

4 files changed, 104 insertions, 1 deletions

diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index 64cbddc7fc5c..d3544d6ee3e9 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,6 +1,9 @@
+AUX hedgewars-0.9.22-rpath-fix.patch 820 SHA256 3da350836b5af65d0ec30090503f8e1a3444953812b15711bea40567a9657f27 SHA512 6b4be0b376f329456f9ae254a1ba674d0c79d37dc697a5db96ad6023eac53727e58e95a7f69fd45659472f7121e8195801beabbd37a7af1b350d0bb2223750c3 WHIRLPOOL fdb6e05f36088b0b5424682047ccf9e109d7f3444c9d84c5cb4fb2eb054da003c9e44a2fa063d4cd1049fd2bf3efd39ea7dfa3455a896fc5d13696d25e818cf1
 DIST hedgewars-src-0.9.22.tar.bz2 160103313 SHA256 b699c8971ff420c3edd6533527ae2e99040f1e79207c9140826945bcf0e62192 SHA512 753cccef09b725048d9e66988b03859a12e577a601656cc2b3dbb2755c59ed9ae4d4c88c9247238408fc76d881c921593a694a58a500b3d5b8c9a4c0cfb053ac WHIRLPOOL c8003da8d1435f4bece344a593bda9b214a24b35ee662310245e13cabc5f35820a38f9ac0883ba5543db413189491f6c3da37b7452034bfa9fb04e8936f52e27
+DIST hedgewars-src-0.9.23.tar.bz2 173042171 SHA256 da2e4908042be56d1c0f3cb80a355bde7f0a49f675b050a03228cc3fb22aae89 SHA512 b9bcd6d32c7bb97c2766aacbc759dd48b7a4c7a72003ab2bf31cdfac94a6e08de740a689458c276d3c35b90e89a1af6c200f98f463e9554e8b176b5706dc3090 WHIRLPOOL 3a623ac8810fb8ced80cea65b71d1a64cc3cb5b4e65356b3d2552f21784fd98db751706c8f48caa5e9648b676e274d249361bfb1a4da715ddd568bbc188619c8
 DIST hedgewars_0.9.22-dfsg-7.debian.tar.xz 79016 SHA256 7c57376a4f85ff33bf9345b46a4df72d70fe9824b8fd7df68b62107dbb8bb5cb SHA512 011d44989b6fcad9ae7a20fcb11a4e2b9a75d1ace6c6e4c2139cd7e67f13ea21d90b6c8a7afb76fa9a06c32537b00b8b4b7689967b3019300e93a7a6fe3e0fbf WHIRLPOOL a8a769b5275b6adec26dce48c113c4a5eb1c69eee9a01e181ec41b611e999a33349bad2b52eaf72099b1dbfce14a1af6e559aaceb3e2ac98ab04065c61bffca7
-EBUILD hedgewars-0.9.22-r2.ebuild 2083 SHA256 ee6a74dfa0709cf9fb446eea2c36ee590dfd0dbf114d624e47c608560f051f33 SHA512 7655400a38c770bc6397c2a400c41cbac4be27be32ba01e92b2ac849bd23a8e26c0dcbad36d97c5d4fda97bd21f4343dba223fa07270d510a8adaac9bb3b78c3 WHIRLPOOL 5c149a4a8d22ecd327ac80f09007e8a6e6bdfb8055c5a0571ad77b7e24c30031053bfa2f3fe509072d367c1ae9b007c40ccb3076740f2b038c86362b9bf55b4e
+EBUILD hedgewars-0.9.22-r2.ebuild 2271 SHA256 ee7626135cb6445fad5b7861314af4b9a545e078688955c290984604b1db2335 SHA512 f1dc1016f1a692b0bf2db813f767ef13cec699f342aaf1e0e91b9a2bd4b66ab831703b58c7df11361875f01fffaaccdf59d22b5e6bdfe4b63c5b3411803d231a WHIRLPOOL b72b9e2daef6346658413e7d019ca2f98d06adfeecf9c9001c7bacd42cacaca1dfd44b4bf6916b76300256f784882db6cd7e35c4596dc94849e3acd49fc6745e
+EBUILD hedgewars-0.9.23.ebuild 2300 SHA256 aa17be1685e1a9b67d37936ef565ff6f96abbe20216ae265f0575c8450999c4e SHA512 b31975c70b4b71b0bbcdb0f9d17361d44afcc8294feeeebcd2ada5df200b14d9ebfad53b05901063bc1f006b8dc9b991d4dc419d66f6191d10aa8b8f8d190d8b WHIRLPOOL 2a0713e73aa495ca0200922188fb779aceca746a511487d10bfa088310c736ef1b7c41e4b9a187c25a0244efda916930f0cbd9d99a08e12472581e2fc9365e66
 MISC ChangeLog 4030 SHA256 1a323a5e882d4fde594c29abaebf23999407cc5cbb638745b888fc3b9e80d248 SHA512 c5dc8595523219594b1c2ee907243e744ceab152112c67c883aee62b2cb0994d86967e50d9054da1e82b631a285a9e3be89d30a97ba589bda7e0af18e6c27eac WHIRLPOOL 76749404a0a372c879a00e5375ae175c15bd4b5d3c3b91b5df42473e48d031d660d3e77bfb49cbd6c3181c587880b329dd976a2431506677efc0361190fff854
 MISC ChangeLog-2015 10076 SHA256 b39f6b35a33e0647e33a95d42b9ddea11ae4fbf65d4e01c75661d1028045ebb7 SHA512 3355d7730828a131b2374a39d0f790247d9dc5851f5ce1345f6dd933f73e95efff841d939f6abe35af5854b5ecfad65b9576721e33c259a1d580a3a138b08c71 WHIRLPOOL a547d1848d08f991184d9543fd4e41855be84a6a068bd3489be747cfa2fbe2bbc73f149ebd978cbd8a48fcb67fc2dfa6de1d30f908a997f46566cccc5991b1e7
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
new file mode 100644
index 000000000000..332c0c3ce4ac
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
@@ -0,0 +1,10 @@
+diff -up hedgewars-src-0.9.22/cmake_modules/paths.cmake~ hedgewars-src-0.9.22/cmake_modules/paths.cmake
+--- hedgewars-src-0.9.22/cmake_modules/paths.cmake~	2015-12-02 15:02:38.000000000 +0100
++++ hedgewars-src-0.9.22/cmake_modules/paths.cmake	2015-12-02 15:15:24.729980850 +0100
+@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF
+     # - the third one is the full path of the system dir
+     #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
+     #skip this if the install prefix is the standard one
+-    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
++    #set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
+ endif(APPLE)
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
index d7016bea411e..d447ec2bd156 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
@@ -46,6 +46,7 @@ RDEPEND="${CDEPEND}
 	>=media-fonts/dejavu-2.28"
 
 S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch )
 
 src_prepare() {
 	while IFS="" read -r f ; do
@@ -64,6 +65,9 @@ src_configure() {
 		-DNOSERVER=TRUE
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
 		-DPHYSFS_SYSTEM=ON
+		# upstream sets RPATH that leafs to weird breakage
+		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
+		-DCMAKE_SKIP_RPATH=ON
 	)
 	cmake-utils_src_configure
 }
diff --git a/games-strategy/hedgewars/hedgewars-0.9.23.ebuild b/games-strategy/hedgewars/hedgewars-0.9.23.ebuild
new file mode 100644
index 000000000000..39c51648164e
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-0.9.23.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake-utils eutils xdg-utils
+
+MY_P=${PN}-src-${PV}
+DEB_PATCH_VER=7
+
+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
+	mirror://debian/pool/main/h/${PN}/${PN}_0.9.22-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
+QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
+
+CDEPEND="
+	>=dev-games/physfs-3.0.1
+	dev-lang/lua:0=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/sdl2-image:=
+	media-libs/sdl2-mixer:=
+	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"
+RDEPEND="${CDEPEND}
+	app-arch/xz-utils
+	media-fonts/wqy-zenhei
+	>=media-fonts/dejavu-2.28"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch )
+
+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=TRUE
+		-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
+		#   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-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	doicon misc/hedgewars.png
+	make_desktop_entry ${PN} Hedgewars
+	doman man/${PN}.6
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}