gentoo resync : 16.04.2022

5 files changed, 23 insertions, 4 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 2766f04f1dfa..5464801c5da8 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 6015cffff207..8c734f2b3403 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,10 +1,11 @@
 AUX devilutionx-1.1.0-no_bundled_font.patch 2134 BLAKE2B 90ab8f267f0a1cb337b3d5432e757931b434eb6ee3915270253daae061400c1425b004f23e3f528daa82ee591d1d7acf7013a2657c01bf387b30976828ec66c8 SHA512 2a9fa26bff1776fc7a8617dd6467b18fea94b0c2b8a651c74cf1dd9f29eff8ea09b4fa188e215264ff622a9aebb597c59299fa489f19328712ce3ec9073a1127
 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
 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
 EBUILD devilutionx-1.1.0-r2.ebuild 1503 BLAKE2B 3bccbae2d574a7d9747710e9c80770740a0d65cbf437ed460d09694e65ee3cc910dc8e337a19caa4cb237acf2202ce39bbd8cb05cbe1d7c1afb0b1bc68d6cb1d SHA512 3489ce76dbe9e8b6c98d4c2c3e3589dd9386dca815eb0d6f07fd4515c818a3f11afe68c26ccaf600f7be4ee8978c9ce69b4351d00b0a69b9752538b52ddc3ffa
 EBUILD devilutionx-1.2.0.ebuild 1445 BLAKE2B d5b2ef602c063c69d64ae0da168a7fd603c5accb0ce1b4bea8ee4a718aadf3e21b7d92b502ec153bb6a1563d1a562ee6129c544394c2a7bcae62ae54b0772349 SHA512 99d624bb30eae10eb1131d6ffa1f186e3b610e1bcb2785923813d140b0855215f10f6f4b46e05a514ba85da3323c202a43e54d3efeb770ba60a3e4f21cbc1137
-EBUILD devilutionx-1.2.1-r1.ebuild 1538 BLAKE2B 0cfdd70d72dd2b46dc0c8a4c2451c6f481872d7a91bee18f165ce201c74412967c1130de560b4317f4658707e10e4f338bebec4195b741fb4fe2fc9e064bb81b SHA512 69101ea1c5d481e0ff326ff85469857be96a319b8ad32c7cb43956b566a9fc639249f2d47ab1dc0300b7146f0a3197d20c651edd5dea86d7bd54e9fc0c5ce4fe
-EBUILD devilutionx-9999.ebuild 1538 BLAKE2B 0cfdd70d72dd2b46dc0c8a4c2451c6f481872d7a91bee18f165ce201c74412967c1130de560b4317f4658707e10e4f338bebec4195b741fb4fe2fc9e064bb81b SHA512 69101ea1c5d481e0ff326ff85469857be96a319b8ad32c7cb43956b566a9fc639249f2d47ab1dc0300b7146f0a3197d20c651edd5dea86d7bd54e9fc0c5ce4fe
+EBUILD devilutionx-1.2.1-r1.ebuild 1594 BLAKE2B 067a470df39d2a88ba19ea20d5ae43529a969606ec2db320cf150756dd4b94e8ec6c8d0dc5aaf1717d518120b40e7026a5c9460facebc10b1e86fb54ac38c5b7 SHA512 679c91d6faaa73711a67107514445f71a1e401e08e71ed7d1fa3c7148a4b8fb5f7b0b706d8bd1f166f73cac8bb13cc9183c92ceb9b8e60fcb7fa0300d986d90a
+EBUILD devilutionx-9999.ebuild 1594 BLAKE2B 067a470df39d2a88ba19ea20d5ae43529a969606ec2db320cf150756dd4b94e8ec6c8d0dc5aaf1717d518120b40e7026a5c9460facebc10b1e86fb54ac38c5b7 SHA512 679c91d6faaa73711a67107514445f71a1e401e08e71ed7d1fa3c7148a4b8fb5f7b0b706d8bd1f166f73cac8bb13cc9183c92ceb9b8e60fcb7fa0300d986d90a
 MISC metadata.xml 437 BLAKE2B defb57e1816a73c361baba921636dde54fc5908a5da8da909db7dfd6e765ba95f59ec9f78cad4812d0c8bd0436e28bd4a0fba41da3f74d9c55f7181ba2f0e647 SHA512 8f9ca87d3a78b5334f352b20f77c2ede8ac25dfefa673d749eff31275f4e3c9f643e4071659cc179ea8d74acea771fc78b46e99b6b72787889ac96f7a5b4c073
diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
index 9dd19f639bcb..2a2abba3eba0 100644
--- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,7 @@ BDEPEND="
 
 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 )
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 9dd19f639bcb..2a2abba3eba0 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,7 @@ BDEPEND="
 
 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 )
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
new file mode 100644
index 000000000000..177287810c94
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
@@ -0,0 +1,16 @@
+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)