gentoo (leap year) resync : 29.02.2020

7 files changed, 55 insertions, 56 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index daa5b5a67a7b..c99a46504aba 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index f9c533529699..ae0427726a05 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,4 +1,4 @@
 AUX dumb-ldflags.patch 655 BLAKE2B 0016029ffcb71378dc3feaca92828b14437c67c9c7000fdac1daa2bedff70129611dd51e03a670c49bfa8d3829a4be0aac35b7f79603ecdc578751005716a8aa SHA512 767e0a1371bfa7c717a3639eb529ce94a1a38e4f8b386972e6e87d44a5a427222f44d4d2929ea9ecb1d8b4e6a5ee4ea1285c93843c00ed23cf97afcbdf0f1f87
 DIST frotz-2.50b2.tar.bz2 281065 BLAKE2B bffe35e9f77e7ef89b76bbe29a3f97ad94ac529bd4930790a25c147f336036b1bfdae1ea52cf87e62121189f4e1bce890f5bc3ddbfb0e68e9ffa290fc1567cc9 SHA512 12398c5bf963aaa7e1ad51a1ca3afaddf4849c2aed8e2cabffc411294b501181de69f99bad2a1c8de9777df4b448af6d85b695c56de4b3112cd32fd7d6cb33c7
-EBUILD frotz-2.50_beta2.ebuild 1815 BLAKE2B 38d7b788259b590ca78cce18c44497c93d9def5cedae2a562b727cb71e5dbb7775ca677b09f699a727f56cc7b51e85ebaacfcbe8f8e9525be6402e99614973c5 SHA512 126df75b58ad5f9bb1668592de3a559135cfc95053cc75d9cd71478308072983548f5a2e67d3fd383fea831d1d34d7aefc389f97535a4ef7a3bd4de045cc89ea
+EBUILD frotz-2.50_beta2.ebuild 1814 BLAKE2B 0f24f2d07bf5c0532517bfd330f96ec90fd5d59e4d49f1aa86e8ec76fec4f29c0bfacc9f0ef29c37786ef4ecd0ad9d62a03cbd1827d79bd1de634abeb5c0af0f SHA512 c9f23711277aab3d807b0840c1130e91a256f628caae08fb7b6c0fd082e48d8ea5af49d9e29b9e8e55faa76b98987575cfedb6ea432318a9b2ea70019a4cb7aa
 MISC metadata.xml 337 BLAKE2B 58dbc1d02cdf6768759edb274b556b608135d088ab1b827abbe23726435e2595a9008a377bd27ebb1b4a517dc9e5ef74a9dcd2e08d829e0aacaa854fc258f830 SHA512 ace3f8702420d20cb543c88e0e22fae40cea97be5d86c40657107b9621c72ef462480a790f26735d212aec7fdffb27a1b00bd48f70d0e030f28efa53f51e0217
diff --git a/games-engines/frotz/frotz-2.50_beta2.ebuild b/games-engines/frotz/frotz-2.50_beta2.ebuild
index 732495e1c963..544ab8e09d62 100644
--- a/games-engines/frotz/frotz-2.50_beta2.ebuild
+++ b/games-engines/frotz/frotz-2.50_beta2.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
@@ -63,7 +63,7 @@ src_compile() {
 		SYSCONFDIR="${EPREFIX}/etc"
 }
 
-src_install () {
+src_install() {
 	emake \
 		install_dumb \
 		$(use ncurses && echo install) \
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
index 32678d3baed8..784570c980d7 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1,3 +1,3 @@
-DIST qtads-2.1.7.tar.bz2 2562026 BLAKE2B daa66022db1b187c2d74fc762fdb60beefb0988401464382d14c6f9bc1455a8046e212cdba9d834decb0efe053b3bb430392696b12bd4f94aaa006744c53a65e SHA512 ab88aa20991642df6048af49d2cd7b804dbb98b3f5c6ab38ad974e8b39531d880eac0eae0ba773f332e9568578b76b677bc35753f7d1e6d9a99d919b15f4c6ee
-EBUILD qtads-2.1.7-r1.ebuild 930 BLAKE2B d8df948d8da8a646e0a2f4e6586e10b03afdc1fd3bd2b9aa9a7a4f50babae0b98166ab2a993625f1b4508090c095ee1d4fde94508547ef5d7db4b5b5380c7cdc SHA512 ea1feb7b2aabc0f403e3176b1a51f3c5924b787a73bdcbd28dc557ffa049f57d7e6b3b14b9885ac66892e6f3ba74e36dd7dcb1a6bc2bfd599486ab85c6c93b5c
-MISC metadata.xml 338 BLAKE2B e923224db53da22487dff5dc33486c7a9b7391d7dbf26a5c11392e0b0808b177488b8b442b888077039d66679cdbd9e87a8389ae347cbc17443eda7e86078015 SHA512 18a82c16eb83363eb440ad9ca6ce1c612a17011194b3e1f50ac2563c0ef72c96c8618643f25ed8df81c852045a281498fabf18468c2181051f28e584738b8472
+DIST qtads-3.0.0-source.tar.xz 5325048 BLAKE2B cb60908e71edb32157638891a58bed83aba01d484821473716c17845094be9232f9e989bad474db27c1e06734b073ee301756b0528ca880e4c40c0994e95bc48 SHA512 e7b72350876475e0b5b9b8c8c953aa380f5f25dade25785d15c5004a6866bb614c3ca2a3b34f84989013e350f9e73d339ce8ddd7d36766d80a981cfbfda7d1c6
+EBUILD qtads-3.0.0.ebuild 849 BLAKE2B a469fe456498ad1f5cb4b7febfdaeb830f4dd10bc9e9997fe22b1fc0c11b4228debfc92b3e0485167f5770315d3db03c208ddf25039abb1635c6ce696cf93f74 SHA512 6617c58720706b65c60101bc60677850352c09a7312f1037347da4dabe1b351ae70bd0c2c8ee243edf9fb3bb085f069a177dd1bcaf683b9ac259162533750f4c
+MISC metadata.xml 599 BLAKE2B 51ed09fd074eb06d9b3abd5274531653f791323717dc3e1f1ab246f10a80daec5c689f9c0083b62d84560862ec1932b892b4896c122c1cfa284613a0f27663df SHA512 73b2eeac86fd8e65a122adc472e108173d2f9423500ef2bce48f32a0c3b956e41c4bdff1bd8e451d07a8b973e358238b482d28866056c60785c39b47c0e8c5f9
diff --git a/games-engines/qtads/metadata.xml b/games-engines/qtads/metadata.xml
index b4146b480895..33b59db35f14 100644
--- a/games-engines/qtads/metadata.xml
+++ b/games-engines/qtads/metadata.xml
@@ -5,7 +5,12 @@
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
   </maintainer>
+  <longdescription lang="en">
+    QTads is a cross-platform, multimedia interpreter for playing TADS games. It
+    is fully compatible with HTML TADS (aka "Multimedia TADS.") Both TADS
+    versions in use today (v2 and v3) are supported.
+  </longdescription>
   <upstream>
-    <remote-id type="sourceforge">qtads</remote-id>
+    <remote-id type="github">realnc/qtads</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/games-engines/qtads/qtads-2.1.7-r1.ebuild b/games-engines/qtads/qtads-2.1.7-r1.ebuild
deleted file mode 100644
index 500c1f64211d..000000000000
--- a/games-engines/qtads/qtads-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils qmake-utils xdg flag-o-matic
-
-DESCRIPTION="Multimedia interpreter for TADS text adventures"
-HOMEPAGE="http://qtads.sourceforge.net"
-SRC_URI="mirror://sourceforge/qtads/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound]
-	media-libs/sdl-mixer[midi,vorbis]
-	media-libs/sdl-sound[mp3]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# bug 654356 temp fix
-	append-cxxflags -fpermissive
-	eqmake5 qtads.pro -after CONFIG-=silent
-}
-
-src_install() {
-	dobin qtads
-	dodoc AUTHORS HTML_TADS_LICENSE NEWS README
-	insinto /usr
-	doins -r share
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_pkg_postrm
-}
diff --git a/games-engines/qtads/qtads-3.0.0.ebuild b/games-engines/qtads/qtads-3.0.0.ebuild
new file mode 100644
index 000000000000..57d338defea2
--- /dev/null
+++ b/games-engines/qtads/qtads-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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" \
+		$(usex !sound CONFIG+=disable-audio '') \
+		-after CONFIG-=silent
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}