gentoo Easter resync : 12.04.2020

3 files changed, 85 insertions, 5 deletions

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index a5e1a7803ca0..b7ea624108be 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,4 +1,6 @@
 DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37
+DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
 EBUILD devilutionx-1.0.0-r1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
-EBUILD devilutionx-9999.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
+EBUILD devilutionx-1.0.1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
+EBUILD devilutionx-9999.ebuild 1820 BLAKE2B 91ff7876c9ecf4797d52d0e8a264f99e5c8dd8c6bf5ccc278aa17cd8add404266350716f8e9b46daec7fbb29ed6f421b687a8f1d495c11ffcd7b70bc67ba2e53 SHA512 bf00756e29a2ef5b8c7a4a19164b23b176f886c99295840c5f10a33a5454a3a80f1d2b885f7edea9eb83ceff1f22235220a1382e272bcf47fa650f7b84dd34f9
 MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.0.1.ebuild b/games-engines/devilutionx/devilutionx-1.0.1.ebuild
new file mode 100644
index 000000000000..b363bc7378ac
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.0.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 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:
+#   https://github.com/diasurgical/devilutionX/issues/490
+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
+"
+
+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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DASAN="OFF"
+		-DDEBUG="$(usex debug)"
+		-DDIST="ON"
+		-DFASTER="OFF"
+		-DLTO="$(usex lto)"
+		-DUBSAN="OFF"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/${PN}"
+
+	newicon -s 32 Packaging/resources/Diablo_32.png ${PN}.png
+	newicon -s 48 Packaging/resources/Diablo_48.png ${PN}.png
+	make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
+}
+
+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/"
+	einfo "and make sure it's writeable (chmod u+w)."
+}
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index b363bc7378ac..829fcf1b68b3 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 # Sometimes build with ninja fails.
 # Please check occasionally if we can revert back to ninja.
 # Latest known issue:
-#   https://github.com/diasurgical/devilutionX/issues/490
-CMAKE_MAKEFILE_GENERATOR="emake"
+#
+#CMAKE_MAKEFILE_GENERATOR="emake"
 
 inherit cmake desktop
 
@@ -62,8 +62,10 @@ src_configure() {
 src_install() {
 	dobin "${BUILD_DIR}/${PN}"
 
-	newicon -s 32 Packaging/resources/Diablo_32.png ${PN}.png
-	newicon -s 48 Packaging/resources/Diablo_48.png ${PN}.png
+	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"
 }