From db6c225250d239135f232fbb07b66a9b806d3571 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 12 Nov 2019 21:09:46 +0100
Subject: [PATCH] gemrb: reuse fhs layout.

---
 games-engines/gemrb/gemrb-0.8.5.recipe        | 11 ++--
 .../gemrb/patches/gemrb-0.8.5.patchset        | 61 +++++++------------
 2 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/games-engines/gemrb/gemrb-0.8.5.recipe b/games-engines/gemrb/gemrb-0.8.5.recipe
index 9ee10ebbd..0e3ea08a1 100644
--- a/games-engines/gemrb/gemrb-0.8.5.recipe
+++ b/games-engines/gemrb/gemrb-0.8.5.recipe
@@ -7,7 +7,7 @@ you like to create a game like Baldur's Gate?"
 HOMEPAGE="https://github.com/gemrb/gemrb"
 COPYRIGHT="2003-2017 The GemRB Team"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/gemrb/gemrb/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="d927e1eebd13a4643db363087fc61c5d2242e8a614da261f15bf4e2b1d94965c"
 SOURCE_FILENAME="gemrb-$portVersion.tar.gz"
@@ -70,7 +70,11 @@ BUILD()
 
 	cmake .. \
 		$cmakeDirArgs \
-		-Wno-dev
+		-Wno-dev \
+		-DDATA_DIR=$dataDir/gemrb \
+		-DMAN_DIR=$manDir/man6 \
+		-DSYSCONF_DIR=$settingsDir/gemrb \
+		-DDOC_DIR=$documentationDir/gemrb
 	make $jobArgs
 }
 
@@ -78,7 +82,4 @@ INSTALL()
 {
 	cd build
 	make install
-
-	# Just icons
-	rm -rf $prefix/share
 }
diff --git a/games-engines/gemrb/patches/gemrb-0.8.5.patchset b/games-engines/gemrb/patches/gemrb-0.8.5.patchset
index 1a925833d..738155c48 100644
--- a/games-engines/gemrb/patches/gemrb-0.8.5.patchset
+++ b/games-engines/gemrb/patches/gemrb-0.8.5.patchset
@@ -1,47 +1,28 @@
-From 91cc2f67a24e4648e151ec9034c7e8efc57f5b80 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
-Date: Mon, 2 Apr 2018 19:08:54 +0200
-Subject: Haiku install paths
+From e070aee8744caa52897290052a76073164ad576e Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 12 Nov 2019 21:02:00 +0100
+Subject: Haiku: don't install icon, logo, menu.
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b5d2017..842a92c 100644
+index b5d2017..d2f56d1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -63,6 +63,8 @@ ENDIF(PREFIX)
- if (NOT LAYOUT)
- 	if (WIN32)
- 		set(LAYOUT "home")
-+	elseif (HAIKU)
-+		set(LAYOUT "haiku")
- 	elseif (APPLE)
- 		set(LAYOUT "bundle")
- 		# favor mac frameworks over unix libraries
-@@ -111,6 +113,24 @@ elseif (${LAYOUT} MATCHES "fhs")
- 	SET_PATH( SVG_DIR ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps )
- 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
- 	SET_PATH( EXAMPLE_CONF_DIR ${SYSCONF_DIR} )
-+elseif (${LAYOUT} MATCHES "haiku")
-+	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/gemrb )
-+	SET_PATH( PLUGIN_DIR ${LIB_DIR}/plugins )
-+	SET_PATH( DATA_DIR ${CMAKE_INSTALL_PREFIX}/data/gemrb )
-+	SET_PATH( MAN_DIR ${CMAKE_INSTALL_PREFIX}/documentation/man/man6 )
-+	SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
-+	IF( NOT SYSCONF_DIR )
-+		if ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" )
-+			SET( SYSCONF_DIR /etc/gemrb )
-+		else ()
-+			SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/settings/gemrb )
-+		endif ()
-+	ENDIF( NOT SYSCONF_DIR )
-+	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/documentation/gemrb )
-+	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
-+	SET_PATH( SVG_DIR ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps )
-+	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
-+	SET_PATH( EXAMPLE_CONF_DIR ${SYSCONF_DIR} )
- elseif (${LAYOUT} MATCHES "opt")
- 	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib )
- 	SET_PATH( PLUGIN_DIR ${LIB_DIR}/plugins )
+@@ -511,9 +511,11 @@ CONFIGURE_FILE(
+ ADD_SUBDIRECTORY( gemrb )
+ IF (NOT APPLE)
+ 	INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/gemrb.6" DESTINATION ${MAN_DIR} )
+-	INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} RENAME gemrb.png )
+-	INSTALL( FILES artwork/logo04-rb_only.svg DESTINATION ${SVG_DIR} RENAME gemrb.svg )
+-	INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} )
++	if (NOT HAIKU)
++		INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} RENAME gemrb.png )
++		INSTALL( FILES artwork/logo04-rb_only.svg DESTINATION ${SVG_DIR} RENAME gemrb.svg )
++		INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} )
++	ENDIF()
+ ENDIF()
+ INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION ${DOC_DIR} )
+ INSTALL( FILES admin/extend2da.py DESTINATION ${BIN_DIR}
 -- 
-2.16.2
+2.24.0