gentoo resync : 25.09.2021

6 files changed, 56 insertions, 6 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index e89093a1493a..b1529a868909 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index ac0a3a870f67..6015cffff207 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -5,6 +5,6 @@ DIST devilutionx-1.2.0.tar.gz 3571940 BLAKE2B 26001a8dc594777dbf6822c41ce89ad08e
 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.ebuild 1473 BLAKE2B 82bb56009b284f51fcc329a7ed54524fcd255cd9c82e9da8afa798e1fa40cc6a6e6f7019e07504fb8b765b9fea88d9e5448ee9d56a992088df2818ced00cab39 SHA512 db1241822c498c75fa832ae578957842ce126fdbb9325c726fd5ca6490f925234435e53561995b3af0ee0e98ba087fa54eea7dee404c2a7c3a679b718a8ea157
-EBUILD devilutionx-9999.ebuild 1473 BLAKE2B 82bb56009b284f51fcc329a7ed54524fcd255cd9c82e9da8afa798e1fa40cc6a6e6f7019e07504fb8b765b9fea88d9e5448ee9d56a992088df2818ced00cab39 SHA512 db1241822c498c75fa832ae578957842ce126fdbb9325c726fd5ca6490f925234435e53561995b3af0ee0e98ba087fa54eea7dee404c2a7c3a679b718a8ea157
+EBUILD devilutionx-1.2.1-r1.ebuild 1538 BLAKE2B 0cfdd70d72dd2b46dc0c8a4c2451c6f481872d7a91bee18f165ce201c74412967c1130de560b4317f4658707e10e4f338bebec4195b741fb4fe2fc9e064bb81b SHA512 69101ea1c5d481e0ff326ff85469857be96a319b8ad32c7cb43956b566a9fc639249f2d47ab1dc0300b7146f0a3197d20c651edd5dea86d7bd54e9fc0c5ce4fe
+EBUILD devilutionx-9999.ebuild 1538 BLAKE2B 0cfdd70d72dd2b46dc0c8a4c2451c6f481872d7a91bee18f165ce201c74412967c1130de560b4317f4658707e10e4f338bebec4195b741fb4fe2fc9e064bb81b SHA512 69101ea1c5d481e0ff326ff85469857be96a319b8ad32c7cb43956b566a9fc639249f2d47ab1dc0300b7146f0a3197d20c651edd5dea86d7bd54e9fc0c5ce4fe
 MISC metadata.xml 437 BLAKE2B defb57e1816a73c361baba921636dde54fc5908a5da8da909db7dfd6e765ba95f59ec9f78cad4812d0c8bd0436e28bd4a0fba41da3f74d9c55f7181ba2f0e647 SHA512 8f9ca87d3a78b5334f352b20f77c2ede8ac25dfefa673d749eff31275f4e3c9f643e4071659cc179ea8d74acea771fc78b46e99b6b72787889ac96f7a5b4c073
diff --git a/games-engines/devilutionx/devilutionx-1.2.1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
index 01125c9e7e42..9dd19f639bcb 100644
--- a/games-engines/devilutionx/devilutionx-1.2.1.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
@@ -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 01125c9e7e42..9dd19f639bcb 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
@@ -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/qtads/Manifest b/games-engines/qtads/Manifest
index e671d640ef9e..a866d116ac8c 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1,4 +1,6 @@
 AUX qtads-3.0-fluidsynth.patch 1817 BLAKE2B 32f61fde3f3521c7d50ca8b67d5a66721caec4595e6a98a15f4434f6da6dda62b75521d64349252a11fd15e0fc62d301db0329dc07ce56783e7eac8beafef791 SHA512 37c0c5e7ad76d9b483c6e3aa02d1b8673bae50820c48197dc1649efed888ee6156a3a935add16ccd006de43e9067e29f0de8b893c85a476ae4b4b32597799253
 DIST qtads-3.0.0-source.tar.xz 5325048 BLAKE2B cb60908e71edb32157638891a58bed83aba01d484821473716c17845094be9232f9e989bad474db27c1e06734b073ee301756b0528ca880e4c40c0994e95bc48 SHA512 e7b72350876475e0b5b9b8c8c953aa380f5f25dade25785d15c5004a6866bb614c3ca2a3b34f84989013e350f9e73d339ce8ddd7d36766d80a981cfbfda7d1c6
+DIST qtads-3.1.0-source.tar.xz 5438292 BLAKE2B 50d4cb8e39ed1da83005f326aa20e595da825acf7b769a4abaa2b319ee9f2da83af435cf676b82d28417ffc751be7ad8ab6bdc09ad3d571a1df068cd1eca48dd SHA512 b79c6e326369c259d293adf8232e7da64b23506ed272a456b57aef3ef92f440d53ca5204bf36a49cae1b783ce864bae1986053d7f0893e70bfbf8877d87b7267
 EBUILD qtads-3.0.0.ebuild 912 BLAKE2B 227fa26b32e4b8e3f41341930fff294bb491d5fddba9dc3624b5a72611704e1932b2d872826c404670a42d4ba098da949288826165c000248031a48144fe3427 SHA512 4d71f4eaffb9dfdd589a67ef123535d1289b03d18139afb81de60c3b0a91488a9985b5549ad35abe895c5e50bb0fcba4be8c1edde8797cffd7943424bf574fd7
+EBUILD qtads-3.1.0.ebuild 849 BLAKE2B 6ed9598cc27cdde4b5d92163e924c56eb809b460eedd00e52c7a2f453bfa41e6f1dedf40af3cec2872b64fc01f72ea452522a50ea1f5cec7bd203630266a040e SHA512 63630980383beee5f67e1dcb5242e965a0285f46102a7be800f29eeb25ff15082833b7f5835a543bbc8a1c477e2547a4032e1b944b36143aafe477d0566011fe
 MISC metadata.xml 600 BLAKE2B 7aa1de6bd8c9c4809e7775a692a69c6e413ed3062a20f89a952859f9b1a4fec9fd86530933edd9e9977df7fba093b1623f231fe8c010dea08d8fb1b89202ff7c SHA512 4d65532cb39d2c90870fbbc1ed038c48646f90f5c5037e69aa1f5b0f965f46a37bd51621aaeebc62f8360b18dbc37e12f605e057d071b6a3313d4a446a66a2c2
diff --git a/games-engines/qtads/qtads-3.1.0.ebuild b/games-engines/qtads/qtads-3.1.0.ebuild
new file mode 100644
index 000000000000..f865caf33793
--- /dev/null
+++ b/games-engines/qtads/qtads-3.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Multimedia interpreter for TADS text adventures"
+HOMEPAGE="https://realnc.github.io/qtads"
+SRC_URI="https://github.com/realnc/qtads/releases/download/v${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sound"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+	sound? (
+		media-libs/libsdl2[sound]
+		media-libs/libsndfile
+		media-libs/libvorbis
+		media-sound/fluidsynth:0=
+		media-sound/mpg123
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5 \
+		PREFIX="${EPREFIX}/usr" \
+		$(usev !sound CONFIG+=disable-audio) \
+		-after CONFIG-=silent
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}