gentoo auto-resync : 21:07:2022 - 08:43:51

6 files changed, 1 insertions, 134 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index f06225297351..683f551ef23b 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index cdd8af13f06c..8ba77e363030 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,8 +1,4 @@
-AUX devilutionx-1.2.0_pre-no_bundled_font.patch 1181 BLAKE2B 004e58c8fb6d29be37ee6471dbecef52b0503ea6b2ad7d892236805f5f8fe42e2247bd94af65fa54a6f53c223d9fae2aee76a6e0959e3266490e954301bd3ced SHA512 7f1823283015f6d2f7c9f34c3b0c9a06e1127d82370ce1d7f5fcf5e429c2bd24e32620871e5eaf1dc7e598da17b73f21205a74f3488ba8a35b4cd258b9bc221a
-AUX devilutionx-1.2.1-disable-ccache.patch 433 BLAKE2B 8b5a462f8c4efb1a50016aae2b5470fd06ec19593de598252d7dabd9f35980b5437f929fa7dcc90b08025f4b2ffab6d897ba33584c685f44752afe237668751b SHA512 223a3659ce926be719b0588104558cfff9da41460532b1face0aed9f9980844a856ee6508a73c929156efb662676b9041fb9d51cc59c8fd66460d795fe1bce90
 AUX devilutionx-1.4.0-system-sdl_audiolib.patch 737 BLAKE2B c0d36bc098c0ce319a8c9c0622d16310e64925a8a48b16670a63242d853b4345aec7f3006e0bff01e622d0a289605964536213faad9359f74274cd40da706246 SHA512 e29ae8854676b9c148410886bc18bfbb38bbf7afdd95c9200ebc33686c4f50f5a0f2e31525bcf11de85b34890557848ec6639a99eadd1763bd637084809a994f
-DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649 SHA512 9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18
 DIST devilutionx-1.4.0.tar.xz 19752052 BLAKE2B 3a79e9d88cc2f5623dfd7d4ad2a0a547361cde8d95197be36dc7076e0b56fa1a915c57bf5537f5e4508201c3b5a283ab90d13db93b3836b0f12c6108abf1578a SHA512 9519c0bd52798f35fc986fab867b0005010f089b35200b5d54b7ed94145c2df54270a570cd3b0ff1c260f645d624a145e3581d744b48ae513919eb2258331bcf
-EBUILD devilutionx-1.2.1-r1.ebuild 1594 BLAKE2B 067a470df39d2a88ba19ea20d5ae43529a969606ec2db320cf150756dd4b94e8ec6c8d0dc5aaf1717d518120b40e7026a5c9460facebc10b1e86fb54ac38c5b7 SHA512 679c91d6faaa73711a67107514445f71a1e401e08e71ed7d1fa3c7148a4b8fb5f7b0b706d8bd1f166f73cac8bb13cc9183c92ceb9b8e60fcb7fa0300d986d90a
 EBUILD devilutionx-1.4.0.ebuild 2034 BLAKE2B 11755a6583cf4a2087b19e4227248628c89140f1831513ee4776995f8c1e182f2d161be1a0e3131d549f8c80a95e16d6fa5792f239e3b0fb0ce73ebb6fba8591 SHA512 b632ced8ddd68340c2195a736f33e4bec4a006db064e422c7f819e254d8d84ab575391c8d53eb5244bf4a37ce0990ba3f2633aa88aa36e84282afeadca92b76c
-MISC metadata.xml 612 BLAKE2B e2c1bf9627497440045ee5718518745537df069dea973147d470937c7f1e4dd25ed8b651a70022077274311989c578519cf3867ceb12318172848e2473accc92 SHA512 ff9ffc791974129ee20220432ce82d80a9b98444c7edeaf88b5286381dde939e86df006cef9f0a88fd28c3c99b1a76fc20a58f04a2f32a307531164882553756
+MISC metadata.xml 542 BLAKE2B 25e292f201570a11d08f4f22922a9dfa1f54d51784be9b38f3b8396a44559ffe6d5f8799e20b8c2fa888ce97e8a45d257894c13924e303a7f93d04c0c046e231 SHA512 acb1603f7e41f47daf7f9fde6128b2f7c51c277cb97be62b87695cceb48fca653f90c2ca3e22238758a78aae4fa34f2de555e07f7e8d896a8ccf5e1c569e8083
diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
deleted file mode 100644
index 2a2abba3eba0..000000000000
--- a/games-engines/devilutionx/devilutionx-1.2.1-r1.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/"
-}
diff --git a/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
deleted file mode 100644
index 01f4006dd13f..000000000000
--- a/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6e75bb9550bd8b4c6249fcfc0cd488224336060e Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 31 Mar 2021 17:55:03 +0200
-Subject: [PATCH] Fix font location
-
-https://bugs.gentoo.org/704508
----
- SourceS/paths.cpp          | 2 +-
- SourceX/DiabloUI/fonts.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SourceS/paths.cpp b/SourceS/paths.cpp
-index dd60fcb5..1c4f9d69 100644
---- a/SourceS/paths.cpp
-+++ b/SourceS/paths.cpp
-@@ -11,7 +11,7 @@
- #endif

- 

- #ifndef TTF_FONT_NAME

--#define TTF_FONT_NAME "CharisSILB.ttf"

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

- #endif

- 

- namespace dvl {

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

- #ifdef __linux__

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

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

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

- 	}

- #endif

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

--- 
-2.31.1
-
diff --git a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
deleted file mode 100644
index 177287810c94..000000000000
--- a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-We let users enable ccache by themselves. Avoids sandbox violation.
-https://bugs.gentoo.org/813768
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,11 +54,6 @@ if(NOT VERSION_NUM)
-   endif()

- endif()

- 

--find_program(CCACHE_PROGRAM ccache)

--if(CCACHE_PROGRAM)

--  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")

--endif()

--

- if(VERSION_NUM MATCHES untagged)

-   project(DevilutionX

-     LANGUAGES C CXX)

diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index ae8bad0665fb..f75265ef16b8 100644
--- a/games-engines/devilutionx/metadata.xml
+++ b/games-engines/devilutionx/metadata.xml
@@ -6,7 +6,6 @@
     <name>Gentoo Games Project</name>
   </maintainer>
   <use>
-    <flag name="lto">Build with link time optimization enabled</flag>
     <flag name="sodium">Enable network packet encryption using <pkg>dev-libs/libsodium</pkg></flag>
     <flag name="zerotier">Enable ZeroTier for online public games</flag>
   </use>