gentoo resync : 15.01.2020

4 files changed, 106 insertions, 8 deletions

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 913df51f6e57..a5e1a7803ca0 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1,4 @@
-EBUILD devilutionx-9999.ebuild 1392 BLAKE2B 6b3bb5b6795f17272b52580b8a99f0e856f781fb6fc01c02b2b0374240f7163d07712bd5380cb96c8a0b1a8811511bc5e4c3deef0c3e292646619a87311d1a8f SHA512 c35c82ac12417653521a0b9c293475a0ab7320f4ac1507ae35be7e823f7c5ae3eb1573599cccb82384f16657d042cb0d07ccf9a326f61612394b7b28de06ae19
-MISC metadata.xml 349 BLAKE2B 11288d110457dff20a74658a3405aadc17fe8acce67069fd5493f0f81e8e2aa59f45ed5808377362f6840670ae6153b199c724b2801b4689394cadb98a8061a1 SHA512 b759e6fb2533964a7226df5a5877f70eb303689f7c0fd598d1d002444ee71ac0b83747a7c8c262f2ad1d087b232de2c1c7bd3b512bbcf3469eec037009ea7f4d
+DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37
+EBUILD devilutionx-1.0.0-r1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
+EBUILD devilutionx-9999.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
+MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..b363bc7378ac
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.0.0-r1.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 d191d5e65931..b363bc7378ac 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ EAPI=7
 #   https://github.com/diasurgical/devilutionX/issues/490
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
@@ -19,15 +19,17 @@ if [[ "${PV}" == 9999 ]] ; then
 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"
+IUSE="debug lto"
 
 RDEPEND="
 	dev-libs/libsodium
+	media-fonts/sil-charis
 	media-libs/libsdl2[haptic]
 	media-libs/sdl2-mixer
 	media-libs/sdl2-ttf
@@ -37,17 +39,32 @@ 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=(
-		-DBINARY_RELEASE=ON
+		-DASAN="OFF"
 		-DDEBUG="$(usex debug)"
+		-DDIST="ON"
+		-DFASTER="OFF"
+		-DLTO="$(usex lto)"
+		-DUBSAN="OFF"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	dobin "${BUILD_DIR}/${PN}"
-	make_desktop_entry ${PN} "Diablo devolved"
+
+	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() {
diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index 81aca5b1e557..6f7209b5d36d 100644
--- a/games-engines/devilutionx/metadata.xml
+++ b/games-engines/devilutionx/metadata.xml
@@ -5,6 +5,9 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <use>
+    <flag name="lto">Build with link time optimization enabled</flag>
+  </use>
   <upstream>
     <remote-id type="github">diasurgical/devilutionX</remote-id>
   </upstream>