[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     3d49f7183d215e1eaf6328198b94b3585b136958
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 11:02:30 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 11:03:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d49f718

games-engines/devilutionx: Initial commit

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 60 +++++++++++++++++++++++
 games-engines/devilutionx/metadata.xml            | 11 +++++
 2 files changed, 71 insertions(+)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
new file mode 100644
index 00000000000..3070232b106
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils 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"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libsodium
+	media-libs/libsdl2[haptic]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# https://github.com/diasurgical/devilutionX/issues/225
+	eapply -R "${FILESDIR}"/${PN}-facebookincubator_find_libsodium.patch
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_RELEASE=ON
+		-DDEBUG="$(usex debug)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/${PN}"
+	make_desktop_entry ${PN} "Diablo devolved"
+}
+
+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/metadata.xml b/games-engines/devilutionx/metadata.xml
new file mode 100644
index 00000000000..81aca5b1e55
--- /dev/null
+++ b/games-engines/devilutionx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">diasurgical/devilutionX</remote-id>
+  </upstream>
+</pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     ff87f1648fae8dc64120e8558166d172a0ded747
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  1 11:59:10 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 11:59:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff87f164

games-engines/devilutionx: Bump to version 1.0.0

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.0.0.ebuild | 60 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
new file mode 100644
index 00000000000..dac3464a12f
--- /dev/null
+++ b/games-engines/devilutionx/Manifest
@@ -0,0 +1 @@
+DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37

diff --git a/games-engines/devilutionx/devilutionx-1.0.0.ebuild b/games-engines/devilutionx/devilutionx-1.0.0.ebuild
new file mode 100644
index 00000000000..6d3bda7a2fb
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.0.0.ebuild
@@ -0,0 +1,60 @@
+# 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"
+
+RDEPEND="
+	dev-libs/libsodium
+	media-libs/libsdl2[haptic]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_RELEASE=ON
+		-DDEBUG="$(usex debug)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/${PN}"
+	make_desktop_entry ${PN} "Diablo devolved"
+}
+
+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)."
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     633e87741329c596d6c1db43707ccfbcf96450c1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  1 11:59:40 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 11:59:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633e8774

games-engines/devilutionx: Synced live ebuild

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index c0684055693..6d3bda7a2fb 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
@@ -19,6 +19,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     f8e41acbb5a2e605480755ca14abc9fdadebb392
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 11:41:32 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 11:49:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e41acb

games-engines/devilutionx: Revbump to handle build options better

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...devilutionx-1.0.0.ebuild => devilutionx-1.0.0-r1.ebuild} | 13 +++++++++++--
 games-engines/devilutionx/metadata.xml                      |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-1.0.0.ebuild b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
similarity index 86%
rename from games-engines/devilutionx/devilutionx-1.0.0.ebuild
rename to games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
index 6d3bda7a2fb..fb3f84ae0c4 100644
--- a/games-engines/devilutionx/devilutionx-1.0.0.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
@@ -25,7 +25,7 @@ fi
 LICENSE="public-domain"
 SLOT="0"
 
-IUSE="debug"
+IUSE="debug lto"
 
 RDEPEND="
 	dev-libs/libsodium
@@ -38,10 +38,19 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" -i SourceS/config.h.in || 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_src_configure
 }

diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index 81aca5b1e55..6f7209b5d36 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>

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     0a1e8a4363f135e88b95d2f0d080e85fe878b76d
Author:     Meik Frischke <meik.frischke <AT> gmail <DOT> com>
AuthorDate: Thu Jan  2 11:47:32 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 11:49:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1e8a43

games-engines/devilutionx: Use CharisSIL-B.ttf font

Install desktop icons and improved .desktop entry

Closes: https://bugs.gentoo.org/704508
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
index fb3f84ae0c4..b363bc7378a 100644
--- a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
@@ -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
@@ -39,7 +40,10 @@ BDEPEND="
 "
 
 src_prepare() {
-	sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" -i SourceS/config.h.in || die
+	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
 }
 
@@ -57,7 +61,10 @@ 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() {

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     d032b5ba37c8c6de3dc0496e92ab64565e1252b4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 11:48:57 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 11:49:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d032b5ba

games-engines/devilutionx: Synced live ebuild

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 6d3bda7a2fb..b363bc7378a 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -25,10 +25,11 @@ 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
@@ -38,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_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() {

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     238181727f7ad733bb1b56657d85a13c4acadc51
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 09:20:33 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 09:20:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23818172

games-engines/devilutionx: Bump to version 1.0.1

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.0.1.ebuild | 76 ++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index dac3464a12f..0930937b2ce 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1 +1,2 @@
 DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37
+DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d

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 00000000000..b363bc7378a
--- /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)."
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     5c23b66104ec74c1fce71da77a8ba9cc34a886dc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 23 15:06:21 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 23 15:22:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c23b661

games-engines/devilutionx: Can be built with ninja again

Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index b363bc7378a..829fcf1b68b 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"
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     5034b3be0cf12eda01846d9f210ca79bafbe8eaf
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 15:54:03 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 15:58:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5034b3be

games-engines/devilutionx: Removed old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 -
 .../devilutionx/devilutionx-1.0.0-r1.ebuild        | 76 ----------------------
 2 files changed, 77 deletions(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 7e238cc664a..26bc86bcb62 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,3 +1,2 @@
-DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37
 DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
 DIST devilutionx-1.0.2.tar.gz 2010077 BLAKE2B 4e89d20263d2ab31e1fca7e8389f0774f4c97f607f633ffc27d0a1ad225b5a351f508ddc9a875d21b64a07e21098cf520e84388712a12ad6c9639b61b2ebdc07 SHA512 dfa5f08a77988eb9ca244b586ecbb4ed430459d369fc98e7853e293c16a06eca7bdd3abb88fa95dff5bcae6be4fd9c20de92389b4c85446487ff5a79480b88a1

diff --git a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
deleted file mode 100644
index b363bc7378a..00000000000
--- a/games-engines/devilutionx/devilutionx-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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)."
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     e989f0cf9ffaa7f9e423ce56b1dc67581069b1f3
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 15:53:32 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 15:58:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e989f0cf

games-engines/devilutionx: Bump to version 1.0.2

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.0.2.ebuild | 78 ++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 0930937b2ce..7e238cc664a 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1,3 @@
 DIST devilutionx-1.0.0.tar.gz 1798349 BLAKE2B f2e49e92d8607974dce25ab4de589f01d5603cec4f96e10e55dbdd55b0352ce46d397c91290812dcd8faaa5794c3ab5b23b922098cab9e44dcaf6d049164f6ae SHA512 65eed32e03051880e2e859984911a76c6aae1853cb57491a04090026d6df9cdadf839a0dbb5433691ed1c83cfa7403c72fede38890d494ffd4eff6bef9030c37
 DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
+DIST devilutionx-1.0.2.tar.gz 2010077 BLAKE2B 4e89d20263d2ab31e1fca7e8389f0774f4c97f607f633ffc27d0a1ad225b5a351f508ddc9a875d21b64a07e21098cf520e84388712a12ad6c9639b61b2ebdc07 SHA512 dfa5f08a77988eb9ca244b586ecbb4ed430459d369fc98e7853e293c16a06eca7bdd3abb88fa95dff5bcae6be4fd9c20de92389b4c85446487ff5a79480b88a1

diff --git a/games-engines/devilutionx/devilutionx-1.0.2.ebuild b/games-engines/devilutionx/devilutionx-1.0.2.ebuild
new file mode 100644
index 00000000000..829fcf1b68b
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.0.2.ebuild
@@ -0,0 +1,78 @@
+# 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:
+#
+#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}"
+
+	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"
+}
+
+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)."
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     13e1343704b4d489de53bc7e9fe48e43ab694463
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 15:58:23 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 15:58:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e13437

games-engines/devilutionx: Adjusted postinst message

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-1.0.2.ebuild | 1 -
 games-engines/devilutionx/devilutionx-9999.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-1.0.2.ebuild b/games-engines/devilutionx/devilutionx-1.0.2.ebuild
index 829fcf1b68b..90302aa10ef 100644
--- a/games-engines/devilutionx/devilutionx-1.0.2.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.0.2.ebuild
@@ -74,5 +74,4 @@ pkg_postinst() {
 	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 829fcf1b68b..90302aa10ef 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -74,5 +74,4 @@ pkg_postinst() {
 	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)."
 }

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     73c3242be4746ac9be4463c08ccfe8072367969a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 07:20:26 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 07:24:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c3242b

games-engines/devilutionx: Bump to version 1.0.3. Removed old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                                      | 2 +-
 .../devilutionx/{devilutionx-1.0.2.ebuild => devilutionx-1.0.3.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 26bc86bcb62..2293e656509 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1,2 @@
 DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
-DIST devilutionx-1.0.2.tar.gz 2010077 BLAKE2B 4e89d20263d2ab31e1fca7e8389f0774f4c97f607f633ffc27d0a1ad225b5a351f508ddc9a875d21b64a07e21098cf520e84388712a12ad6c9639b61b2ebdc07 SHA512 dfa5f08a77988eb9ca244b586ecbb4ed430459d369fc98e7853e293c16a06eca7bdd3abb88fa95dff5bcae6be4fd9c20de92389b4c85446487ff5a79480b88a1
+DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa

diff --git a/games-engines/devilutionx/devilutionx-1.0.2.ebuild b/games-engines/devilutionx/devilutionx-1.0.3.ebuild
similarity index 100%
rename from games-engines/devilutionx/devilutionx-1.0.2.ebuild
rename to games-engines/devilutionx/devilutionx-1.0.3.ebuild

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     b86f77aa5d8cd9cc8ab6f3583493222d0d2cf3dc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 12:59:23 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 13:22:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86f77aa

games-engines/devilutionx: Bump to version 1.1.0

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.1.0.ebuild | 60 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 2293e656509..5a52cb9928f 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/games-engines/devilutionx/devilutionx-1.1.0.ebuild b/games-engines/devilutionx/devilutionx-1.1.0.ebuild
new file mode 100644
index 00000000000..3966e9a6b14
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.1.0.ebuild
@@ -0,0 +1,60 @@
+# 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:
+#
+#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-libs/libsdl2[haptic]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+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/"
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     8a0c4010eda125d1b9df1be81b3224b995affe66
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 13:22:49 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 13:22:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0c4010

games-engines/devilutionx: Synced live ebuild

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 90302aa10ef..3966e9a6b14 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -29,7 +29,6 @@ IUSE="debug lto"
 
 RDEPEND="
 	dev-libs/libsodium
-	media-fonts/sil-charis
 	media-libs/libsdl2[haptic]
 	media-libs/sdl2-mixer
 	media-libs/sdl2-ttf
@@ -39,34 +38,18 @@ 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)"
+		-DDISABLE_LTO="$(usex !lto)"
 		-DDIST="ON"
-		-DFASTER="OFF"
-		-DLTO="$(usex lto)"
 		-DUBSAN="OFF"
 	)
 	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/${PN}"
 
-	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"
+	# 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() {

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     4c3c1f142e58787c09900e790080cccf2f512174
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 23:20:09 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 23:20:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c3c1f14

games-engines/devilutionx: Synced live ebuild

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 3966e9a6b14..913e1f40eef 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"

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     0206c8ccadfef9af0d941de729c12cd2c66ff098
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 12:25:40 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 13:00:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0206c8cc

games-engines/devilutionx: Removed old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 -
 games-engines/devilutionx/devilutionx-1.0.1.ebuild | 76 ----------------------
 games-engines/devilutionx/devilutionx-1.1.0.ebuild | 60 -----------------
 3 files changed, 137 deletions(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 5a52cb9928f..db8b4caaf6a 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,3 +1,2 @@
-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

diff --git a/games-engines/devilutionx/devilutionx-1.0.1.ebuild b/games-engines/devilutionx/devilutionx-1.0.1.ebuild
deleted file mode 100644
index b363bc7378a..00000000000
--- a/games-engines/devilutionx/devilutionx-1.0.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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-1.1.0.ebuild b/games-engines/devilutionx/devilutionx-1.1.0.ebuild
deleted file mode 100644
index 3966e9a6b14..00000000000
--- a/games-engines/devilutionx/devilutionx-1.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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:
-#
-#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-libs/libsdl2[haptic]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-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/"
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     08959a02b676fd536fde813aad50307a157abc8c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 15:25:43 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 15:25:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08959a02

games-engines/devilutionx: Added "hellfire" USE flag

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 10 +++++++---
 games-engines/devilutionx/metadata.xml            |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 913e1f40eef..5c1340040dd 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -25,7 +25,7 @@ fi
 LICENSE="public-domain"
 SLOT="0"
 
-IUSE="debug lto"
+IUSE="debug +hellfire lto"
 
 RDEPEND="
 	dev-libs/libsodium
@@ -50,11 +50,15 @@ src_configure() {
 		-DDISABLE_LTO="$(usex !lto)"
 		-DDIST="ON"
 		-DUBSAN="OFF"
+		-DHELLFIRE="$(usex hellfire)"
 	)
 	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
+	if [[ "${PV}" != 9999 ]] ; then
+		# Build system still doesn't reliably set release version
+		sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" \
+			|| die
+	fi
 }
 
 pkg_postinst() {

diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index 6f7209b5d36..cb26cf9fd00 100644
--- a/games-engines/devilutionx/metadata.xml
+++ b/games-engines/devilutionx/metadata.xml
@@ -6,6 +6,7 @@
     <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>

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     9c29502a0c6dbf7d2791488739dbb3929a7923a6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 15:46:53 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 15:47:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c29502a

games-engines/devilutionx: Removed "hellfire" USE flag

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 3 +--
 games-engines/devilutionx/metadata.xml            | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 5c1340040dd..3c50e3ab9fb 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -25,7 +25,7 @@ fi
 LICENSE="public-domain"
 SLOT="0"
 
-IUSE="debug +hellfire lto"
+IUSE="debug lto"
 
 RDEPEND="
 	dev-libs/libsodium
@@ -50,7 +50,6 @@ src_configure() {
 		-DDISABLE_LTO="$(usex !lto)"
 		-DDIST="ON"
 		-DUBSAN="OFF"
-		-DHELLFIRE="$(usex hellfire)"
 	)
 	cmake_src_configure
 

diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index cb26cf9fd00..6f7209b5d36 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>

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Sam James]

commit:     114d819b4c3254ceb8f08274a8b640bf3beb3157
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 06:57:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 07:21:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=114d819b

games-engines/devilutionx: desktop--

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild | 2 +-
 games-engines/devilutionx/devilutionx-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
index 913e1f40eef..ed7391e75b0 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-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 70c9bb47460..739888cc60a 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"

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     73c73dfa01fcedac222d5d188376dd9a58aa164d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 09:24:05 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 09:25:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c73dfa

games-engines/devilutionx: Synced live ebuild

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 739888cc60a..6f93a6c2ac0 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -51,13 +51,12 @@ src_configure() {
 		-DDIST="ON"
 		-DUBSAN="OFF"
 	)
-	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() {

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     d0ab7d6f367e56c254eecb54599ef352e7939bcb
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 09:21:55 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 09:25:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ab7d6f

games-engines/devilutionx: Bump to version 1.2.0

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.2.0.ebuild | 67 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index db8b4caaf6a..79c675779d8 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1,3 @@
 DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
 DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
+DIST devilutionx-1.2.0.tar.gz 3571940 BLAKE2B 26001a8dc594777dbf6822c41ce89ad08e6cdff5621c04083ede1398cd12d4c4496da91e4cfed674e73c5411b2c569539a37102c4a418d552bb383a71527a4f2 SHA512 30ae94feacb9125345f877981c0e23ccbc3a0db96be6c5b1a402c7c5685b5f60f825c9dcde91dbf344b845c03b0b77358e5c656aac7869b5c450b72457da02c9

diff --git a/games-engines/devilutionx/devilutionx-1.2.0.ebuild b/games-engines/devilutionx/devilutionx-1.2.0.ebuild
new file mode 100644
index 00000000000..6f93a6c2ac0
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.2.0.ebuild
@@ -0,0 +1,67 @@
+# 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
+)
+
+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/"
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     1262fe1037650b989cff82519b80d73aad4e8b89
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 09:24:36 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 09:25:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1262fe10

games-engines/devilutionx: Removed old

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 -
 games-engines/devilutionx/devilutionx-1.0.3.ebuild | 77 ----------------------
 2 files changed, 78 deletions(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 79c675779d8..a3018a86cce 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,3 +1,2 @@
-DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
 DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
 DIST devilutionx-1.2.0.tar.gz 3571940 BLAKE2B 26001a8dc594777dbf6822c41ce89ad08e6cdff5621c04083ede1398cd12d4c4496da91e4cfed674e73c5411b2c569539a37102c4a418d552bb383a71527a4f2 SHA512 30ae94feacb9125345f877981c0e23ccbc3a0db96be6c5b1a402c7c5685b5f60f825c9dcde91dbf344b845c03b0b77358e5c656aac7869b5c450b72457da02c9

diff --git a/games-engines/devilutionx/devilutionx-1.0.3.ebuild b/games-engines/devilutionx/devilutionx-1.0.3.ebuild
deleted file mode 100644
index 90302aa10ef..00000000000
--- a/games-engines/devilutionx/devilutionx-1.0.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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:
-#
-#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}"
-
-	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"
-}
-
-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/"
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     a828b55296410bd48e796cef03f0a3a4232b1af2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 10:25:22 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 10:25:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a828b552

games-engines/devilutionx: Install changelog file

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 6f93a6c2ac0..01125c9e7e4 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -43,6 +43,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
 )
 
+DOCS=( docs/CHANGELOG.md )
+
 src_configure() {
 	local mycmakeargs=(
 		-DASAN="OFF"

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Lars Wendler]

commit:     9d9b895c96872255400e584e76e4a75828275eb0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 06:33:06 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 06:33:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9b895c

games-engines/devilutionx: Bump to version 1.2.1

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.2.1.ebuild | 69 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index a3018a86cce..e21f9b5eae1 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1,3 @@
 DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
 DIST devilutionx-1.2.0.tar.gz 3571940 BLAKE2B 26001a8dc594777dbf6822c41ce89ad08e6cdff5621c04083ede1398cd12d4c4496da91e4cfed674e73c5411b2c569539a37102c4a418d552bb383a71527a4f2 SHA512 30ae94feacb9125345f877981c0e23ccbc3a0db96be6c5b1a402c7c5685b5f60f825c9dcde91dbf344b845c03b0b77358e5c656aac7869b5c450b72457da02c9
+DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649 SHA512 9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18

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 00000000000..01125c9e7e4
--- /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/"
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Sam James]

commit:     10f72b03c4cd2ee737367663c7598fa0e9e0b1fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 01:44:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 17 19:55:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f72b03

games-engines/devilutionx: use dynamic linking (fixes libsodium build)

-DDIST controls whether devilutionx links dynamically to libraries
(only SDL 2 and glibc are linked dynamically otherwise).

For later versions of libsodium, FindSodium.cmake malfunctions and
does not correctly populate all the needed variables. For Gentoo's
purposes, we can ignore this problem, and instead force dynamic
linking (which is policy anyway).

A fix to use a supported method to detect libsodium (pkg-config)
is being pursued upstream.

Maintainer timeout.

Bug: https://github.com/diasurgical/devilutionX/issues/2615
Closes: https://bugs.gentoo.org/791031
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{devilutionx-1.2.1.ebuild => devilutionx-1.2.1-r1.ebuild}         | 4 +++-
 games-engines/devilutionx/devilutionx-9999.ebuild                     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-1.2.1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
similarity index 94%
rename from games-engines/devilutionx/devilutionx-1.2.1.ebuild
rename to games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
index 01125c9e7e4..17884b883e8 100644
--- a/games-engines/devilutionx/devilutionx-1.2.1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
@@ -50,7 +50,9 @@ src_configure() {
 		-DASAN="OFF"
 		-DDEBUG="$(usex debug)"
 		-DDISABLE_LTO="$(usex !lto)"
-		-DDIST="ON"
+		# Must be off to force dynamic linking.
+		# See bug #791031
+		-DDIST="OFF"
 		-DUBSAN="OFF"
 	)
 

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 01125c9e7e4..17884b883e8 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -50,7 +50,9 @@ src_configure() {
 		-DASAN="OFF"
 		-DDEBUG="$(usex debug)"
 		-DDISABLE_LTO="$(usex !lto)"
-		-DDIST="ON"
+		# Must be off to force dynamic linking.
+		# See bug #791031
+		-DDIST="OFF"
 		-DUBSAN="OFF"
 	)
 

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Sam James]

commit:     791b464c43aa44529992ecfcd50b8a648702c3ee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 01:49:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 17 19:55:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=791b464c

games-engines/devilutionx: subscribe to libsodium subslot

We need to be rebuilt when the subslot (ABI) of libsodium changes.

Maintainer timeout.

Bug: https://bugs.gentoo.org/791031
Closes: https://github.com/gentoo/gentoo/pull/22008
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild | 2 +-
 games-engines/devilutionx/devilutionx-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
index 17884b883e8..9dd19f639bc 100644
--- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 IUSE="debug lto"
 
 RDEPEND="
-	dev-libs/libsodium
+	dev-libs/libsodium:=
 	media-fonts/sil-charis
 	media-libs/libsdl2[haptic]
 	media-libs/sdl2-mixer

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 17884b883e8..9dd19f639bc 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 IUSE="debug lto"
 
 RDEPEND="
-	dev-libs/libsodium
+	dev-libs/libsodium:=
 	media-fonts/sil-charis
 	media-libs/libsdl2[haptic]
 	media-libs/sdl2-mixer

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     cc14b559f21c2f8c68e79e67bf282e16d8ebf3e6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 07:57:32 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 08:07:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc14b559

games-engines/devilutionx: adopt for games@

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index 5f1b5083e066..6831710f8df5 100644
--- a/games-engines/devilutionx/metadata.xml
+++ b/games-engines/devilutionx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
     <flag name="lto">Build with link time optimization enabled</flag>
   </use>

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     c0dddc20ded3d2ccf018b43f050593d7f59a37d9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 19:56:23 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 01:50:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0dddc20

games-engines/devilutionx: drop 1.1.0-r2, 1.2.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  2 -
 .../devilutionx/devilutionx-1.1.0-r2.ebuild        | 65 ---------------------
 games-engines/devilutionx/devilutionx-1.2.0.ebuild | 67 ----------------------
 3 files changed, 134 deletions(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index e21f9b5eae14..6f525083a265 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,3 +1 @@
-DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
-DIST devilutionx-1.2.0.tar.gz 3571940 BLAKE2B 26001a8dc594777dbf6822c41ce89ad08e6cdff5621c04083ede1398cd12d4c4496da91e4cfed674e73c5411b2c569539a37102c4a418d552bb383a71527a4f2 SHA512 30ae94feacb9125345f877981c0e23ccbc3a0db96be6c5b1a402c7c5685b5f60f825c9dcde91dbf344b845c03b0b77358e5c656aac7869b5c450b72457da02c9
 DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649 SHA512 9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18

diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
deleted file mode 100644
index ed7391e75b02..000000000000
--- a/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.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-1.2.0.ebuild b/games-engines/devilutionx/devilutionx-1.2.0.ebuild
deleted file mode 100644
index 6f93a6c2ac09..000000000000
--- a/games-engines/devilutionx/devilutionx-1.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-)
-
-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/"
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     18a27f0913413b84af17431c7e7f27dde3456144
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 01:45:16 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 01:59:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a27f09

games-engines/devilutionx: drop broken live ebuild

This needs additional tools to generate assets and fetching/moving
sources if not from a release tarball (formerly was kept in git,
but not anymore) and would rather not maintain that.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-9999.ebuild | 72 -----------------------
 1 file changed, 72 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
deleted file mode 100644
index 2a2abba3eba0..000000000000
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 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
-	"${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768
-)
-
-DOCS=( docs/CHANGELOG.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DASAN="OFF"
-		-DDEBUG="$(usex debug)"
-		-DDISABLE_LTO="$(usex !lto)"
-		# Must be off to force dynamic linking.
-		# See bug #791031
-		-DDIST="OFF"
-		-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/"
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     f5ebed6b96e3cf5ee0b5202c41ca613a57a63ffe
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 02:45:19 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 02:46:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5ebed6b

games-engines/devilutionx: cleanup forgotten bit of live version

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/devilutionx/devilutionx-1.4.0.ebuild b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
index c4ee3ebfae38..300818559589 100644
--- a/games-engines/devilutionx/devilutionx-1.4.0.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
@@ -50,8 +50,8 @@ src_configure() {
 		-DDISABLE_ZERO_TIER=$(usex !zerotier)
 		-DPACKET_ENCRYPTION=$(usex sodium)
 		-DPIE=ON
+		-DVERSION_NUM=${PV}
 	)
-	[[ ${PV} == 9999 ]] || mycmakeargs+=( -DVERSION_NUM=${PV} )
 
 	cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     6e6f500244676e15142e42b03743509a4d65e552
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 04:16:55 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 04:21:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e6f5002

games-engines/devilutionx: add reminder for more unbundling

Upstream will have a switch next version to unbundle simpleini,
and could likely unbundle at least zerotier too.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-1.4.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-engines/devilutionx/devilutionx-1.4.0.ebuild b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
index 300818559589..3c66107e8e2e 100644
--- a/games-engines/devilutionx/devilutionx-1.4.0.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
@@ -43,6 +43,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		# TODO: unbundle simpleini next version (will use system by default),
+		# and try to for at least zerotier too
 		-DBUILD_TESTING=$(usex test)
 		-DCCACHE_PROGRAM=OFF #813768
 		-DDEBUG=$(usex debug)

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     9ad0f256f6be6b5c6c2a476441c6fb3117eb5e49
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 04:41:18 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 04:42:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad0f256

games-engines/devilutionx: drop zerotier from unbundling reminder

Upstream uses a modified fork, so that probably will end up messy.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-1.4.0.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/games-engines/devilutionx/devilutionx-1.4.0.ebuild b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
index 3c66107e8e2e..d96c2032f7ce 100644
--- a/games-engines/devilutionx/devilutionx-1.4.0.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.4.0.ebuild
@@ -43,8 +43,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		# TODO: unbundle simpleini next version (will use system by default),
-		# and try to for at least zerotier too
+		# TODO: unbundle simpleini next version (will use system by default)
 		-DBUILD_TESTING=$(usex test)
 		-DCCACHE_PROGRAM=OFF #813768
 		-DDEBUG=$(usex debug)

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     76d32116ea2da9952507f29bf76970f58923cd61
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 22:54:28 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 23:17:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d32116

games-engines/devilutionx: add 1.4.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.4.1.ebuild | 77 ++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index f2549f29e76a..be798b6b8683 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1 +1,2 @@
 DIST devilutionx-1.4.0.tar.xz 19752052 BLAKE2B 3a79e9d88cc2f5623dfd7d4ad2a0a547361cde8d95197be36dc7076e0b56fa1a915c57bf5537f5e4508201c3b5a283ab90d13db93b3836b0f12c6108abf1578a SHA512 9519c0bd52798f35fc986fab867b0005010f089b35200b5d54b7ed94145c2df54270a570cd3b0ff1c260f645d624a145e3581d744b48ae513919eb2258331bcf
+DIST devilutionx-1.4.1.tar.xz 19679968 BLAKE2B 51ae007d5d1dce25a9af20b98017826534d835c2a74bfcd78cb4fb3c8e86b4e2e55a302e0412cbbcff8f931ad33a2baab806199769660351f31cc49fa91814b6 SHA512 9709600395abfd697bc45757bd2cf3e5cf0e07e2c55c86a48a73e9f52003c274724e26306b4fcb36c2eda0776c51dbab96599c0d14744244c8c037fd5dd14263

diff --git a/games-engines/devilutionx/devilutionx-1.4.1.ebuild b/games-engines/devilutionx/devilutionx-1.4.1.ebuild
new file mode 100644
index 000000000000..e7608abb497b
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.4.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX/"
+SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}/${PN}-src-${PV}-5ad792133"
+
+LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +sodium test zerotier"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libfmt:=
+	media-libs/libsdl2[haptic,joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib:=
+	media-libs/sdl_audiolib
+	sodium? ( dev-libs/libsodium:= )"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/asio
+	dev-cpp/simpleini
+	test? ( dev-cpp/gtest )"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# use system asio
+	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
+
+	# ensure system copies are used
+	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=OFF #813768
+		-DDEBUG=$(usex debug)
+		-DDISABLE_LTO=ON # let CFLAGS control this
+		-DDISABLE_ZERO_TIER=$(usex !zerotier)
+		-DPACKET_ENCRYPTION=$(usex sodium)
+		-DPIE=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( Packaging/nix/README.txt docs/*.md )
+	cmake_src_install
+
+	rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "In order to play the game, you will need to copy the following data file"
+		elog "from the original game, and optionally the hellfire expansion files:"
+		elog "	- DIABDAT.MPQ"
+		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
+		elog "to ~/.local/share/diasurgical/devilution/"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     3b5e2d17077e42d7b733350270aed57f01b3fb98
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 12:59:56 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 13:52:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5e2d17

games-engines/devilutionx: add 1.5.0

Hopefully not overlooking anything, there's a lot of noise in the
cmake files diff making it hard to pickup changes that'd affect us.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.5.0.ebuild | 83 ++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index c36842a8700d..4515dbd20298 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1 +1,2 @@
 DIST devilutionx-1.4.1.tar.xz 19679968 BLAKE2B 51ae007d5d1dce25a9af20b98017826534d835c2a74bfcd78cb4fb3c8e86b4e2e55a302e0412cbbcff8f931ad33a2baab806199769660351f31cc49fa91814b6 SHA512 9709600395abfd697bc45757bd2cf3e5cf0e07e2c55c86a48a73e9f52003c274724e26306b4fcb36c2eda0776c51dbab96599c0d14744244c8c037fd5dd14263
+DIST devilutionx-1.5.0.tar.xz 21951316 BLAKE2B efc6d3539eed25f917d30f3a858903952068bf4d4c66b0cd39f1a86ce3f98d9d67a8bce3a2467fa22e91bd2f552fbb593b602273e163422ab5f133133d513060 SHA512 df4998a86203372b82cb3be0348a1555ea95127a22ef050fed068215fd2223550f2b64364d83a58f829398169a29a5990d4332dc7f0adec6316f3a6c8e280ccb

diff --git a/games-engines/devilutionx/devilutionx-1.5.0.ebuild b/games-engines/devilutionx/devilutionx-1.5.0.ebuild
new file mode 100644
index 000000000000..a755734d4453
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.5.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX/"
+SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}/${PN}-src-${PV}"
+
+LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +sodium test zerotier"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libfmt:=
+	media-libs/libsdl2[haptic,joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib:=
+	media-libs/sdl_audiolib
+	sodium? ( dev-libs/libsodium:= )"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/asio
+	dev-cpp/simpleini
+	test? ( dev-cpp/gtest )"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# use system asio
+	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
+
+	# ensure system copies are used
+	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=no #813768
+		-DDEBUG=$(usex debug)
+		-DDISABLE_LTO=yes # let CFLAGS control this
+		-DDISABLE_ZERO_TIER=$(usex !zerotier)
+		-DPACKET_ENCRYPTION=$(usex sodium)
+		-DPIE=yes
+		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# timedemo tests only pass when game assets are available
+	cmake_src_test -E Timedemo.
+}
+
+src_install() {
+	local DOCS=( Packaging/nix/README.txt docs/*.md )
+	cmake_src_install
+
+	rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "In order to play the game, you will need to copy the following data file"
+		elog "from the original game, and optionally the hellfire expansion files:"
+		elog "	- DIABDAT.MPQ"
+		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
+		elog "to ~/.local/share/diasurgical/devilution/"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     fdf3a6ff7d8be2cb8ec2d7aa5dafbf4222d4bb73
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 21:06:54 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 21:19:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf3a6ff

games-engines/devilutionx: drop 1.4.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 -
 games-engines/devilutionx/devilutionx-1.4.1.ebuild | 77 ----------------------
 2 files changed, 78 deletions(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 4515dbd20298..cbd3474c99a4 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1 @@
-DIST devilutionx-1.4.1.tar.xz 19679968 BLAKE2B 51ae007d5d1dce25a9af20b98017826534d835c2a74bfcd78cb4fb3c8e86b4e2e55a302e0412cbbcff8f931ad33a2baab806199769660351f31cc49fa91814b6 SHA512 9709600395abfd697bc45757bd2cf3e5cf0e07e2c55c86a48a73e9f52003c274724e26306b4fcb36c2eda0776c51dbab96599c0d14744244c8c037fd5dd14263
 DIST devilutionx-1.5.0.tar.xz 21951316 BLAKE2B efc6d3539eed25f917d30f3a858903952068bf4d4c66b0cd39f1a86ce3f98d9d67a8bce3a2467fa22e91bd2f552fbb593b602273e163422ab5f133133d513060 SHA512 df4998a86203372b82cb3be0348a1555ea95127a22ef050fed068215fd2223550f2b64364d83a58f829398169a29a5990d4332dc7f0adec6316f3a6c8e280ccb

diff --git a/games-engines/devilutionx/devilutionx-1.4.1.ebuild b/games-engines/devilutionx/devilutionx-1.4.1.ebuild
deleted file mode 100644
index e7608abb497b..000000000000
--- a/games-engines/devilutionx/devilutionx-1.4.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX/"
-SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}/${PN}-src-${PV}-5ad792133"
-
-LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +sodium test zerotier"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2:=
-	dev-libs/libfmt:=
-	media-libs/libsdl2[haptic,joystick,opengl,video]
-	media-libs/sdl2-image[png]
-	sys-libs/zlib:=
-	media-libs/sdl_audiolib
-	sodium? ( dev-libs/libsodium:= )"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/asio
-	dev-cpp/simpleini
-	test? ( dev-cpp/gtest )"
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# use system asio
-	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
-
-	# ensure system copies are used
-	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCCACHE_PROGRAM=OFF #813768
-		-DDEBUG=$(usex debug)
-		-DDISABLE_LTO=ON # let CFLAGS control this
-		-DDISABLE_ZERO_TIER=$(usex !zerotier)
-		-DPACKET_ENCRYPTION=$(usex sodium)
-		-DPIE=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	local DOCS=( Packaging/nix/README.txt docs/*.md )
-	cmake_src_install
-
-	rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "In order to play the game, you will need to copy the following data file"
-		elog "from the original game, and optionally the hellfire expansion files:"
-		elog "	- DIABDAT.MPQ"
-		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
-		elog "to ~/.local/share/diasurgical/devilution/"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ulrich Müller]

commit:     01bfeb33f04bc8424a0ae284ed5380ff84cf7ed4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 09:40:07 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 09:40:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bfeb33

games-engines/devilutionx: update LICENSE

Bug: https://bugs.gentoo.org/912053
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 games-engines/devilutionx/devilutionx-1.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/devilutionx/devilutionx-1.5.0.ebuild b/games-engines/devilutionx/devilutionx-1.5.0.ebuild
index a755734d4453..0c35013e0a96 100644
--- a/games-engines/devilutionx/devilutionx-1.5.0.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.5.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/diasurgical/devilutionX/"
 SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz -> ${P}.tar.xz"
 S="${WORKDIR}/${PN}-src-${PV}"
 
-LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BSL-1.1 )"
+LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +sodium test zerotier"

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     fe7881d4a15feb85f23952fe121bc962a309db18
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 06:41:45 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 07:01:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7881d4

games-engines/devilutionx: add 1.5.1

Meant to handle this a while ago but got side-tracked.

Closes: https://github.com/gentoo/gentoo/pull/33021
Thanks-to: burningserenity <burningserenity <AT> novo-ordo.com>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.5.1.ebuild | 88 ++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index cbd3474c99a4..96a8f265ee41 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1 +1,2 @@
 DIST devilutionx-1.5.0.tar.xz 21951316 BLAKE2B efc6d3539eed25f917d30f3a858903952068bf4d4c66b0cd39f1a86ce3f98d9d67a8bce3a2467fa22e91bd2f552fbb593b602273e163422ab5f133133d513060 SHA512 df4998a86203372b82cb3be0348a1555ea95127a22ef050fed068215fd2223550f2b64364d83a58f829398169a29a5990d4332dc7f0adec6316f3a6c8e280ccb
+DIST devilutionx-1.5.1.tar.xz 21971268 BLAKE2B fdcbfad36ded01ca40643d114ffd49b300ccf98b11415cbc396f226d42aa315502319e94e9075a2308f1f003db9611d1232170564f30cc3f09cb4b4db7f82b35 SHA512 c712c8215947a117777313bfe24c8b24e8efa702a211e67bee1ae7276176be782394dc32f1cc4509e1539fdca8b1181884f5bc9dc4cf46890f4c57a378fb5d3b

diff --git a/games-engines/devilutionx/devilutionx-1.5.1.ebuild b/games-engines/devilutionx/devilutionx-1.5.1.ebuild
new file mode 100644
index 000000000000..1ad3e2aafedd
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.5.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX/"
+SRC_URI="
+	https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz
+		-> ${P}.tar.xz
+"
+S="${WORKDIR}/${PN}-src-${PV}"
+
+LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +sodium test zerotier"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libfmt:=
+	media-libs/libsdl2[haptic,joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib:=
+	media-libs/sdl_audiolib
+	sodium? ( dev-libs/libsodium:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/asio
+	dev-cpp/simpleini
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# use system asio
+	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
+
+	# ensure system copies are used
+	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=no #813768
+		-DDEBUG=$(usex debug)
+		-DDISABLE_LTO=yes # let CFLAGS control this
+		-DDISABLE_ZERO_TIER=$(usex !zerotier)
+		-DPACKET_ENCRYPTION=$(usex sodium)
+		-DPIE=yes
+		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# timedemo tests only pass when game assets are available
+	cmake_src_test -E Timedemo.
+}
+
+src_install() {
+	local DOCS=( Packaging/nix/README.txt docs/*.md )
+	cmake_src_install
+
+	rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "In order to play the game, you will need to copy the following data file"
+		elog "from the original game, and optionally the hellfire expansion files:"
+		elog "	- DIABDAT.MPQ"
+		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
+		elog "to ~/.local/share/diasurgical/devilution/"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     4908eacd5b32a872531b39f3673e5bcc0df57812
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 18:50:58 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 20:18:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4908eacd

games-engines/devilutionx: drop 1.5.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 -
 games-engines/devilutionx/devilutionx-1.5.0.ebuild | 83 ----------------------
 2 files changed, 84 deletions(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 96a8f265ee41..bb1e2d9fb67f 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1 @@
-DIST devilutionx-1.5.0.tar.xz 21951316 BLAKE2B efc6d3539eed25f917d30f3a858903952068bf4d4c66b0cd39f1a86ce3f98d9d67a8bce3a2467fa22e91bd2f552fbb593b602273e163422ab5f133133d513060 SHA512 df4998a86203372b82cb3be0348a1555ea95127a22ef050fed068215fd2223550f2b64364d83a58f829398169a29a5990d4332dc7f0adec6316f3a6c8e280ccb
 DIST devilutionx-1.5.1.tar.xz 21971268 BLAKE2B fdcbfad36ded01ca40643d114ffd49b300ccf98b11415cbc396f226d42aa315502319e94e9075a2308f1f003db9611d1232170564f30cc3f09cb4b4db7f82b35 SHA512 c712c8215947a117777313bfe24c8b24e8efa702a211e67bee1ae7276176be782394dc32f1cc4509e1539fdca8b1181884f5bc9dc4cf46890f4c57a378fb5d3b

diff --git a/games-engines/devilutionx/devilutionx-1.5.0.ebuild b/games-engines/devilutionx/devilutionx-1.5.0.ebuild
deleted file mode 100644
index 0c35013e0a96..000000000000
--- a/games-engines/devilutionx/devilutionx-1.5.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX/"
-SRC_URI="https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}/${PN}-src-${PV}"
-
-LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +sodium test zerotier"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2:=
-	dev-libs/libfmt:=
-	media-libs/libsdl2[haptic,joystick,opengl,video]
-	media-libs/sdl2-image[png]
-	sys-libs/zlib:=
-	media-libs/sdl_audiolib
-	sodium? ( dev-libs/libsodium:= )"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/asio
-	dev-cpp/simpleini
-	test? ( dev-cpp/gtest )"
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# use system asio
-	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
-
-	# ensure system copies are used
-	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCCACHE_PROGRAM=no #813768
-		-DDEBUG=$(usex debug)
-		-DDISABLE_LTO=yes # let CFLAGS control this
-		-DDISABLE_ZERO_TIER=$(usex !zerotier)
-		-DPACKET_ENCRYPTION=$(usex sodium)
-		-DPIE=yes
-		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# timedemo tests only pass when game assets are available
-	cmake_src_test -E Timedemo.
-}
-
-src_install() {
-	local DOCS=( Packaging/nix/README.txt docs/*.md )
-	cmake_src_install
-
-	rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "In order to play the game, you will need to copy the following data file"
-		elog "from the original game, and optionally the hellfire expansion files:"
-		elog "	- DIABDAT.MPQ"
-		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
-		elog "to ~/.local/share/diasurgical/devilution/"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     0af2853047da7d35bde7a4b05d75319e6dc7b2a2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 09:13:57 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 09:14:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af28530

games-engines/devilutionx: add 1.5.2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.5.2.ebuild | 89 ++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index bb1e2d9fb67f..d24cec6bdc4f 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1 +1,2 @@
 DIST devilutionx-1.5.1.tar.xz 21971268 BLAKE2B fdcbfad36ded01ca40643d114ffd49b300ccf98b11415cbc396f226d42aa315502319e94e9075a2308f1f003db9611d1232170564f30cc3f09cb4b4db7f82b35 SHA512 c712c8215947a117777313bfe24c8b24e8efa702a211e67bee1ae7276176be782394dc32f1cc4509e1539fdca8b1181884f5bc9dc4cf46890f4c57a378fb5d3b
+DIST devilutionx-1.5.2.tar.xz 21968848 BLAKE2B 5a8c280f262e2d0f47ee5978cfc858ea62481eac838ad691996f359f1c4889499e4c78b5e6a1f2dc998cf0fc89ebbdf79296a25adb411e30e9248cce1b07d3a8 SHA512 b7fd5814c8671e439d4349297cfda0d89eb1f7a0945ec11bdf7a83637371664c9c39c036249e1650911397111e1b5d9e931f221ffd2d4a1f9e80d5ca58357dcf

diff --git a/games-engines/devilutionx/devilutionx-1.5.2.ebuild b/games-engines/devilutionx/devilutionx-1.5.2.ebuild
new file mode 100644
index 000000000000..29c272d0006a
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.5.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX/"
+SRC_URI="
+	https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz
+		-> ${P}.tar.xz
+"
+S=${WORKDIR}/${PN}-src-${PV}
+
+LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +sodium test zerotier"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libfmt:=
+	media-libs/libsdl2[haptic,joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	media-libs/sdl_audiolib
+	sys-libs/zlib:=
+	sodium? ( dev-libs/libsodium:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/asio
+	dev-cpp/simpleini
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-devel/gettext
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# use system asio
+	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
+
+	# ensure system copies are used
+	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=no #813768
+		-DDEBUG=$(usex debug)
+		-DDISABLE_LTO=yes # let CFLAGS control this
+		-DDISABLE_ZERO_TIER=$(usex !zerotier)
+		-DPACKET_ENCRYPTION=$(usex sodium)
+		-DPIE=yes
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# timedemo tests only pass when game assets are available
+	cmake_src_test -E Timedemo.
+}
+
+src_install() {
+	local DOCS=( Packaging/nix/README.txt docs/*.md )
+	cmake_src_install
+
+	rm -- "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "In order to play the game, you will need to copy the following data file"
+		elog "from the original game, and optionally the hellfire expansion files:"
+		elog "	- DIABDAT.MPQ"
+		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
+		elog "to ~/.local/share/diasurgical/devilution/"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     6b1b9a168bfe8e202e7722f10ff855aa276840ff
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 05:13:21 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 06:14:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b1b9a16

games-engines/devilutionx: drop 1.5.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 -
 games-engines/devilutionx/devilutionx-1.5.1.ebuild | 88 ----------------------
 2 files changed, 89 deletions(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index d24cec6bdc4f..511b29de8cd0 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1 @@
-DIST devilutionx-1.5.1.tar.xz 21971268 BLAKE2B fdcbfad36ded01ca40643d114ffd49b300ccf98b11415cbc396f226d42aa315502319e94e9075a2308f1f003db9611d1232170564f30cc3f09cb4b4db7f82b35 SHA512 c712c8215947a117777313bfe24c8b24e8efa702a211e67bee1ae7276176be782394dc32f1cc4509e1539fdca8b1181884f5bc9dc4cf46890f4c57a378fb5d3b
 DIST devilutionx-1.5.2.tar.xz 21968848 BLAKE2B 5a8c280f262e2d0f47ee5978cfc858ea62481eac838ad691996f359f1c4889499e4c78b5e6a1f2dc998cf0fc89ebbdf79296a25adb411e30e9248cce1b07d3a8 SHA512 b7fd5814c8671e439d4349297cfda0d89eb1f7a0945ec11bdf7a83637371664c9c39c036249e1650911397111e1b5d9e931f221ffd2d4a1f9e80d5ca58357dcf

diff --git a/games-engines/devilutionx/devilutionx-1.5.1.ebuild b/games-engines/devilutionx/devilutionx-1.5.1.ebuild
deleted file mode 100644
index 1ad3e2aafedd..000000000000
--- a/games-engines/devilutionx/devilutionx-1.5.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX/"
-SRC_URI="
-	https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz
-		-> ${P}.tar.xz
-"
-S="${WORKDIR}/${PN}-src-${PV}"
-
-LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +sodium test zerotier"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2:=
-	dev-libs/libfmt:=
-	media-libs/libsdl2[haptic,joystick,opengl,video]
-	media-libs/sdl2-image[png]
-	sys-libs/zlib:=
-	media-libs/sdl_audiolib
-	sodium? ( dev-libs/libsodium:= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/asio
-	dev-cpp/simpleini
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# use system asio
-	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
-
-	# ensure system copies are used
-	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCCACHE_PROGRAM=no #813768
-		-DDEBUG=$(usex debug)
-		-DDISABLE_LTO=yes # let CFLAGS control this
-		-DDISABLE_ZERO_TIER=$(usex !zerotier)
-		-DPACKET_ENCRYPTION=$(usex sodium)
-		-DPIE=yes
-		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# timedemo tests only pass when game assets are available
-	cmake_src_test -E Timedemo.
-}
-
-src_install() {
-	local DOCS=( Packaging/nix/README.txt docs/*.md )
-	cmake_src_install
-
-	rm "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "In order to play the game, you will need to copy the following data file"
-		elog "from the original game, and optionally the hellfire expansion files:"
-		elog "	- DIABDAT.MPQ"
-		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
-		elog "to ~/.local/share/diasurgical/devilution/"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     6e88fd1c3d281c3d60309e5cb1abb40f9a061ed2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 09:28:36 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 11:51:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e88fd1c

games-engines/devilutionx: add 1.5.3

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 +
 games-engines/devilutionx/devilutionx-1.5.3.ebuild | 89 ++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 511b29de8cd0..299e15cb86fe 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1 +1,2 @@
 DIST devilutionx-1.5.2.tar.xz 21968848 BLAKE2B 5a8c280f262e2d0f47ee5978cfc858ea62481eac838ad691996f359f1c4889499e4c78b5e6a1f2dc998cf0fc89ebbdf79296a25adb411e30e9248cce1b07d3a8 SHA512 b7fd5814c8671e439d4349297cfda0d89eb1f7a0945ec11bdf7a83637371664c9c39c036249e1650911397111e1b5d9e931f221ffd2d4a1f9e80d5ca58357dcf
+DIST devilutionx-1.5.3.tar.xz 22394112 BLAKE2B 1b04c7fe334ddfd6b1eb619b1e86c1e429f6c26c980a16129d8322bb30641409d9d11a203e42ccdbce60a05e00dc49b1a2acbdd1007c5f99e40b88acd1251440 SHA512 619873bb232d1b344f5001c232364af9cfcda72e44f28fd2a15332292fa37c0e64b7fccade3570b96bd648be235ed56e0cc2e3fd8299ac57ef26f2ce844cbc2f

diff --git a/games-engines/devilutionx/devilutionx-1.5.3.ebuild b/games-engines/devilutionx/devilutionx-1.5.3.ebuild
new file mode 100644
index 000000000000..d344483cdb2b
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.5.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX/"
+SRC_URI="
+	https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz
+		-> ${P}.tar.xz
+"
+S=${WORKDIR}/${PN}-src-${PV}
+
+LICENSE="Unlicense BSD CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +sodium test zerotier"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libfmt:=
+	media-libs/libsdl2[haptic,joystick,opengl,video]
+	media-libs/sdl2-image[png]
+	media-libs/sdl_audiolib
+	sys-libs/zlib:=
+	sodium? ( dev-libs/libsodium:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/asio
+	dev-cpp/simpleini
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-devel/gettext
+"
+
+CMAKE_SKIP_TESTS=(
+	# timedemo tests only pass when game assets are available
+	Timedemo.
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# use system asio
+	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
+
+	# ensure system copies are used
+	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=no #813768
+		-DDEBUG=$(usex debug)
+		-DDISABLE_LTO=yes # let CFLAGS control this
+		-DDISABLE_ZERO_TIER=$(usex !zerotier)
+		-DPACKET_ENCRYPTION=$(usex sodium)
+		-DPIE=yes
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( Packaging/nix/README.txt docs/*.md )
+	cmake_src_install
+
+	rm -- "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "In order to play the game, you will need to copy the following data file"
+		elog "from the original game, and optionally the hellfire expansion files:"
+		elog "	- DIABDAT.MPQ"
+		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
+		elog "to ~/.local/share/diasurgical/devilution/"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

[Ionen Wolkens]

commit:     6102c33d12744ce1417d99f5e9ba50f60ad9608a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  4 15:19:48 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov  4 16:13:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6102c33d

games-engines/devilutionx: drop 1.5.2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-engines/devilutionx/Manifest                 |  1 -
 games-engines/devilutionx/devilutionx-1.5.2.ebuild | 89 ----------------------
 2 files changed, 90 deletions(-)

diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 299e15cb86fe..cce23aa680f0 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,2 +1 @@
-DIST devilutionx-1.5.2.tar.xz 21968848 BLAKE2B 5a8c280f262e2d0f47ee5978cfc858ea62481eac838ad691996f359f1c4889499e4c78b5e6a1f2dc998cf0fc89ebbdf79296a25adb411e30e9248cce1b07d3a8 SHA512 b7fd5814c8671e439d4349297cfda0d89eb1f7a0945ec11bdf7a83637371664c9c39c036249e1650911397111e1b5d9e931f221ffd2d4a1f9e80d5ca58357dcf
 DIST devilutionx-1.5.3.tar.xz 22394112 BLAKE2B 1b04c7fe334ddfd6b1eb619b1e86c1e429f6c26c980a16129d8322bb30641409d9d11a203e42ccdbce60a05e00dc49b1a2acbdd1007c5f99e40b88acd1251440 SHA512 619873bb232d1b344f5001c232364af9cfcda72e44f28fd2a15332292fa37c0e64b7fccade3570b96bd648be235ed56e0cc2e3fd8299ac57ef26f2ce844cbc2f

diff --git a/games-engines/devilutionx/devilutionx-1.5.2.ebuild b/games-engines/devilutionx/devilutionx-1.5.2.ebuild
deleted file mode 100644
index 29c272d0006a..000000000000
--- a/games-engines/devilutionx/devilutionx-1.5.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX/"
-SRC_URI="
-	https://github.com/diasurgical/devilutionX/releases/download/${PV}/devilutionx-src.tar.xz
-		-> ${P}.tar.xz
-"
-S=${WORKDIR}/${PN}-src-${PV}
-
-LICENSE="Unlicense CC-BY-4.0 GPL-2+ LGPL-2.1+ MIT OFL-1.1 zerotier? ( BUSL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +sodium test zerotier"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2:=
-	dev-libs/libfmt:=
-	media-libs/libsdl2[haptic,joystick,opengl,video]
-	media-libs/sdl2-image[png]
-	media-libs/sdl_audiolib
-	sys-libs/zlib:=
-	sodium? ( dev-libs/libsodium:= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/asio
-	dev-cpp/simpleini
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	sys-devel/gettext
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# use system asio
-	echo 'add_library(asio INTERFACE)' > 3rdParty/asio/CMakeLists.txt || die
-
-	# ensure system copies are used
-	rm -r dist/{asio,simpleini,sdl_audiolib}-src || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCCACHE_PROGRAM=no #813768
-		-DDEBUG=$(usex debug)
-		-DDISABLE_LTO=yes # let CFLAGS control this
-		-DDISABLE_ZERO_TIER=$(usex !zerotier)
-		-DPACKET_ENCRYPTION=$(usex sodium)
-		-DPIE=yes
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# timedemo tests only pass when game assets are available
-	cmake_src_test -E Timedemo.
-}
-
-src_install() {
-	local DOCS=( Packaging/nix/README.txt docs/*.md )
-	cmake_src_install
-
-	rm -- "${ED}"/usr/share/diasurgical/devilutionx/README.txt || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "In order to play the game, you will need to copy the following data file"
-		elog "from the original game, and optionally the hellfire expansion files:"
-		elog "	- DIABDAT.MPQ"
-		elog "	- hellfire.mpq hfmonk.mpq hfmusic.mpq hfvoice.mpq"
-		elog "to ~/.local/share/diasurgical/devilution/"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.txt* for details."
-	fi
-}