5 files changed, 125 insertions, 2 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 9a831e952d80..96a7514c16fb 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 54cf9f37bb5c..2d03274ed51a 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,8 +1,10 @@
+AUX devilutionx-1.1.0-no_bundled_font.patch 1772 BLAKE2B 29c4b17ade1e742ef1dd5137b100df027381f9865f0ddf2295470a5fdcf53e1a2aaa4850f3ea43d05af81546b32ab037fbf226c302bf93fe4ab53396ab81bd27 SHA512 7f1a5ff1b5f0d9d0ea5c2374413cf80424583e46529633272ea903c794a2f5b6f091471a493772f85d13c53a5a8aaf9cf20e8fd165895eb486a7f6a487fecf44
 DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
 DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
 DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
 EBUILD devilutionx-1.0.1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
 EBUILD devilutionx-1.0.3.ebuild 1769 BLAKE2B 7fe565f6aca3136c4de53a66b9be8ba8fa578e4bfc1148f1b487ffc6463c729ee68b43dedbfb951cda13117aa7b1f777931a7b947ec6ba1a84a4c659a7c60042 SHA512 2eb1ba1badf306794b13b6d2e4d32ed5d0a7e669f962eec9cba0cddb2d05143453fc078a08c7117f1b4068e2082cafe309ba46a35c6c6139b6c5a0323d86bae2
+EBUILD devilutionx-1.1.0-r1.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
 EBUILD devilutionx-1.1.0.ebuild 1417 BLAKE2B caeb8713f216959fc44550fe5a1c78d139634b7c2a9188c2fe546247adcf0602ea7b6a4e3bf3c959d4814f4a604e18354db972bda8a23d7a0f9574fba56f21f5 SHA512 cf122f1c69585e733db8d38c8cad28bead978920c5fc3369fd3e8455ffecdffda49d8725a29a2ec3d325fb8a4331d1ec9a2317ff7b3cb12a6508c37deda79ab3
-EBUILD devilutionx-9999.ebuild 1417 BLAKE2B caeb8713f216959fc44550fe5a1c78d139634b7c2a9188c2fe546247adcf0602ea7b6a4e3bf3c959d4814f4a604e18354db972bda8a23d7a0f9574fba56f21f5 SHA512 cf122f1c69585e733db8d38c8cad28bead978920c5fc3369fd3e8455ffecdffda49d8725a29a2ec3d325fb8a4331d1ec9a2317ff7b3cb12a6508c37deda79ab3
+EBUILD devilutionx-9999.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
 MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..913e1f40eef5
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Sometimes build with ninja fails.
+# Please check occasionally if we can revert back to ninja.
+# Latest known issue:
+#
+#CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake desktop
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
+else
+	SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/devilutionX-${PV}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+IUSE="debug lto"
+
+RDEPEND="
+	dev-libs/libsodium
+	media-fonts/sil-charis
+	media-libs/libsdl2[haptic]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DASAN="OFF"
+		-DDEBUG="$(usex debug)"
+		-DDISABLE_LTO="$(usex !lto)"
+		-DDIST="ON"
+		-DUBSAN="OFF"
+	)
+	cmake_src_configure
+
+	# Build system still doesn't reliably set release version in the build
+	sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die
+}
+
+pkg_postinst() {
+	einfo "In order to play the game you need to install the file"
+	einfo "  diabdat.mpq"
+	einfo "from the original game CD into the following directory:"
+	einfo "  \${HOME}/.local/share/diasurgical/devilution/"
+}
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 3966e9a6b14a..913e1f40eef5 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.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
@@ -29,6 +29,7 @@ IUSE="debug lto"
 
 RDEPEND="
 	dev-libs/libsodium
+	media-fonts/sil-charis
 	media-libs/libsdl2[haptic]
 	media-libs/sdl2-mixer
 	media-libs/sdl2-ttf
@@ -38,6 +39,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DASAN="OFF"
diff --git a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
new file mode 100644
index 000000000000..7944a8221d2d
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/704508
+
+--- devilutionX-1.1.0/CMakeLists.txt
++++ devilutionX-1.1.0/CMakeLists.txt
+@@ -298,7 +298,6 @@
+   SourceX/main.cpp
+   SourceX/devilutionx.exe.manifest
+   Packaging/macOS/AppIcon.icns
+-  Packaging/resources/CharisSILB.ttf
+   Packaging/windows/devilutionx.rc)
+ 
+ if(NOT NONET)
+@@ -339,9 +338,6 @@
+ 
+ add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS})
+ 
+-# Copy the font to the build directory to it works from the build directory
+-file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+-
+ # Use file GENERATE instead of configure_file because configure_file
+ # does not support generator expressions.
+ get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+@@ -563,7 +559,6 @@
+ 
+ if(APPLE)
+   set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+-  set_source_files_properties("./Packaging/resources/CharisSILB.ttf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+   set(MACOSX_BUNDLE_GUI_IDENTIFIER com.diasurgical.devilutionx)
+   set(MACOSX_BUNDLE_COPYRIGHT Unlicense)
+   set(MACOSX_BUNDLE_BUNDLE_NAME devilutionx)
+@@ -624,9 +619,6 @@
+       DESTINATION "share/icons/hicolor/512x512/apps"
+       RENAME "${project_name}.png"
+     )
+-    install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
+-      DESTINATION "share/fonts/truetype"
+-    )
+ 
+     # -G DEB
+     set(CPACK_PACKAGE_CONTACT "anders@jenbo.dk")
+--- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
++++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
+@@ -11,7 +11,7 @@
+ #endif
+ 
+ #ifndef TTF_FONT_NAME
+-#define TTF_FONT_NAME "CharisSILB.ttf"
++#define TTF_FONT_NAME "CharisSIL-B.ttf"
+ #endif
+ 
+ namespace dvl {