gentoo resync : 28.04.2021

7 files changed, 136 insertions, 35 deletions

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 0ab84482a690..4e005628d12e 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,7 +1,10 @@
 AUX devilutionx-1.1.0-no_bundled_font.patch 2134 BLAKE2B 90ab8f267f0a1cb337b3d5432e757931b434eb6ee3915270253daae061400c1425b004f23e3f528daa82ee591d1d7acf7013a2657c01bf387b30976828ec66c8 SHA512 2a9fa26bff1776fc7a8617dd6467b18fea94b0c2b8a651c74cf1dd9f29eff8ea09b4fa188e215264ff622a9aebb597c59299fa489f19328712ce3ec9073a1127
-DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
+AUX devilutionx-1.2.0_pre-no_bundled_font.patch 1181 BLAKE2B 004e58c8fb6d29be37ee6471dbecef52b0503ea6b2ad7d892236805f5f8fe42e2247bd94af65fa54a6f53c223d9fae2aee76a6e0959e3266490e954301bd3ced SHA512 7f1823283015f6d2f7c9f34c3b0c9a06e1127d82370ce1d7f5fcf5e429c2bd24e32620871e5eaf1dc7e598da17b73f21205a74f3488ba8a35b4cd258b9bc221a
 DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
-EBUILD devilutionx-1.0.3.ebuild 1769 BLAKE2B 7fe565f6aca3136c4de53a66b9be8ba8fa578e4bfc1148f1b487ffc6463c729ee68b43dedbfb951cda13117aa7b1f777931a7b947ec6ba1a84a4c659a7c60042 SHA512 2eb1ba1badf306794b13b6d2e4d32ed5d0a7e669f962eec9cba0cddb2d05143453fc078a08c7117f1b4068e2082cafe309ba46a35c6c6139b6c5a0323d86bae2
-EBUILD devilutionx-1.1.0-r2.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
-EBUILD devilutionx-9999.ebuild 1584 BLAKE2B 31cfbd6270b2c29c5f8afb973ff1b014746f8fe2cf09a037509ff9109afa83d9a67251a31da19b02efccc807728726eb6e7f83c37052a0799cab223ab136e396 SHA512 2bfffd043da7b982126751e19b12412078118a6860bc12e447ffd4bfb57abb7d97b27dd0a8f748de6e8d17fdbcb65e3aa54035db52262947d3f74303fd6fdc56
-MISC metadata.xml 514 BLAKE2B 4727c5e4a5c51860b85e4e4eb8edb531294617a740d1d3deb246f6a35fe065f050fead6b19ceaf4580d51e692fef138a02fa18cd21f9cb749701ac7fd53fd5ee SHA512 3f67564be4d4944f8e21e759f4fce6f9f13887538b903f644f5d8549cfa8349b7827da2f7b3d46210f3f712f4c6e8041484100b901aaafa464a380e718be929e
+DIST devilutionx-1.2.0.tar.gz 3571940 BLAKE2B 26001a8dc594777dbf6822c41ce89ad08e6cdff5621c04083ede1398cd12d4c4496da91e4cfed674e73c5411b2c569539a37102c4a418d552bb383a71527a4f2 SHA512 30ae94feacb9125345f877981c0e23ccbc3a0db96be6c5b1a402c7c5685b5f60f825c9dcde91dbf344b845c03b0b77358e5c656aac7869b5c450b72457da02c9
+DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649 SHA512 9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18
+EBUILD devilutionx-1.1.0-r2.ebuild 1503 BLAKE2B 3bccbae2d574a7d9747710e9c80770740a0d65cbf437ed460d09694e65ee3cc910dc8e337a19caa4cb237acf2202ce39bbd8cb05cbe1d7c1afb0b1bc68d6cb1d SHA512 3489ce76dbe9e8b6c98d4c2c3e3589dd9386dca815eb0d6f07fd4515c818a3f11afe68c26ccaf600f7be4ee8978c9ce69b4351d00b0a69b9752538b52ddc3ffa
+EBUILD devilutionx-1.2.0.ebuild 1445 BLAKE2B d5b2ef602c063c69d64ae0da168a7fd603c5accb0ce1b4bea8ee4a718aadf3e21b7d92b502ec153bb6a1563d1a562ee6129c544394c2a7bcae62ae54b0772349 SHA512 99d624bb30eae10eb1131d6ffa1f186e3b610e1bcb2785923813d140b0855215f10f6f4b46e05a514ba85da3323c202a43e54d3efeb770ba60a3e4f21cbc1137
+EBUILD devilutionx-1.2.1.ebuild 1473 BLAKE2B 82bb56009b284f51fcc329a7ed54524fcd255cd9c82e9da8afa798e1fa40cc6a6e6f7019e07504fb8b765b9fea88d9e5448ee9d56a992088df2818ced00cab39 SHA512 db1241822c498c75fa832ae578957842ce126fdbb9325c726fd5ca6490f925234435e53561995b3af0ee0e98ba087fa54eea7dee404c2a7c3a679b718a8ea157
+EBUILD devilutionx-9999.ebuild 1473 BLAKE2B 82bb56009b284f51fcc329a7ed54524fcd255cd9c82e9da8afa798e1fa40cc6a6e6f7019e07504fb8b765b9fea88d9e5448ee9d56a992088df2818ced00cab39 SHA512 db1241822c498c75fa832ae578957842ce126fdbb9325c726fd5ca6490f925234435e53561995b3af0ee0e98ba087fa54eea7dee404c2a7c3a679b718a8ea157
+MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
index 913e1f40eef5..ed7391e75b02 100644
--- a/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 #
 #CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake desktop
+inherit cmake
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
diff --git a/games-engines/devilutionx/devilutionx-1.0.3.ebuild b/games-engines/devilutionx/devilutionx-1.2.0.ebuild
index 90302aa10ef4..6f93a6c2ac09 100644
--- a/games-engines/devilutionx/devilutionx-1.0.3.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.2.0.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
@@ -9,7 +9,7 @@ EAPI=7
 #
 #CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake desktop
+inherit cmake
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
@@ -39,34 +39,24 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" \
-		-i SourceS/config.h.in || die
-	sed 's/CharisSILB.ttf/CharisSIL-B.ttf/g' \
-		-i SourceX/DiabloUI/fonts.h || die
-	cmake_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
+)
 
 src_configure() {
 	local mycmakeargs=(
 		-DASAN="OFF"
 		-DDEBUG="$(usex debug)"
+		-DDISABLE_LTO="$(usex !lto)"
 		-DDIST="ON"
-		-DFASTER="OFF"
-		-DLTO="$(usex lto)"
 		-DUBSAN="OFF"
 	)
-	cmake_src_configure
-}
 
-src_install() {
-	dobin "${BUILD_DIR}/${PN}"
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DVERSION_NUM="${PV}" )
+	fi
 
-	local size
-	for size in 32 48 ; do
-		newicon -s ${size} Packaging/resources/Diablo_${size}.png ${PN}.png
-	done
-	make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/games-engines/devilutionx/devilutionx-1.2.1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1.ebuild
new file mode 100644
index 000000000000..01125c9e7e42
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.2.1.ebuild
@@ -0,0 +1,69 @@
+# 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
+
+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.2.0_pre-no_bundled_font.patch" #704508
+)
+
+DOCS=( docs/CHANGELOG.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DASAN="OFF"
+		-DDEBUG="$(usex debug)"
+		-DDISABLE_LTO="$(usex !lto)"
+		-DDIST="ON"
+		-DUBSAN="OFF"
+	)
+
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DVERSION_NUM="${PV}" )
+	fi
+
+	cmake_src_configure
+}
+
+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 5c1340040ddd..01125c9e7e42 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 #
 #CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake desktop
+inherit cmake
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
@@ -25,7 +25,7 @@ fi
 LICENSE="public-domain"
 SLOT="0"
 
-IUSE="debug +hellfire lto"
+IUSE="debug lto"
 
 RDEPEND="
 	dev-libs/libsodium
@@ -40,9 +40,11 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+	"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
 )
 
+DOCS=( docs/CHANGELOG.md )
+
 src_configure() {
 	local mycmakeargs=(
 		-DASAN="OFF"
@@ -50,15 +52,13 @@ src_configure() {
 		-DDISABLE_LTO="$(usex !lto)"
 		-DDIST="ON"
 		-DUBSAN="OFF"
-		-DHELLFIRE="$(usex hellfire)"
 	)
-	cmake_src_configure
 
 	if [[ "${PV}" != 9999 ]] ; then
-		# Build system still doesn't reliably set release version
-		sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" \
-			|| die
+		mycmakeargs+=( -DVERSION_NUM="${PV}" )
 	fi
+
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
new file mode 100644
index 000000000000..01f4006dd13f
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
@@ -0,0 +1,40 @@
+From 6e75bb9550bd8b4c6249fcfc0cd488224336060e Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 31 Mar 2021 17:55:03 +0200
+Subject: [PATCH] Fix font location
+
+https://bugs.gentoo.org/704508
+---
+ SourceS/paths.cpp          | 2 +-
+ SourceX/DiabloUI/fonts.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/SourceS/paths.cpp b/SourceS/paths.cpp
+index dd60fcb5..1c4f9d69 100644
+--- a/SourceS/paths.cpp
++++ b/SourceS/paths.cpp
+@@ -11,7 +11,7 @@
+ #endif

+ 

+ #ifndef TTF_FONT_NAME

+-#define TTF_FONT_NAME "CharisSILB.ttf"

++#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf"

+ #endif

+ 

+ namespace dvl {

+diff --git a/SourceX/DiabloUI/fonts.cpp b/SourceX/DiabloUI/fonts.cpp
+index 178dcbe9..5f825886 100644
+--- a/SourceX/DiabloUI/fonts.cpp
++++ b/SourceX/DiabloUI/fonts.cpp
+@@ -66,7 +66,7 @@ void LoadTtfFont()
+ 	std::string ttf_font_path = GetTtfPath() + GetTtfName();

+ #ifdef __linux__

+ 	if (!FileExists(ttf_font_path.c_str())) {

+-		ttf_font_path = "/usr/share/fonts/truetype/" + GetTtfName();

++		ttf_font_path = "/usr/share/fonts/" + GetTtfName();

+ 	}

+ #endif

+ 	font = TTF_OpenFont(ttf_font_path.c_str(), 17);

+-- 
+2.31.1
+
diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index cb26cf9fd006..6f7209b5d36d 100644
--- a/games-engines/devilutionx/metadata.xml
+++ b/games-engines/devilutionx/metadata.xml
@@ -6,7 +6,6 @@
     <name>Lars Wendler</name>
   </maintainer>
   <use>
-    <flag name="hellfire">Enable support for Diablo Hellfire Expansion</flag>
     <flag name="lto">Build with link time optimization enabled</flag>
   </use>
   <upstream>