gentoo resync : 28.04.2021

4 files changed, 13 insertions, 58 deletions

diff --git a/games-engines/frobtads/Manifest b/games-engines/frobtads/Manifest
index b1fde9d5833b..9980d587ff20 100644
--- a/games-engines/frobtads/Manifest
+++ b/games-engines/frobtads/Manifest
@@ -1,6 +1,4 @@
-AUX frobtads-1.2.4-tinfo.patch 371 BLAKE2B 6690cc8e118aaacb86e9451fb87118733960e6416396df03d0ad543cb530bffbe8709afdcdd6af207ca6c089ffca40dcec9380def6b6df173eea5ef4c76346e9 SHA512 69786ccc1c8670db199666a42d8d5ca11ac6deea2300732aae76bc54612827b818f331eb96bbc8af0aa45b94bbb0954f21d95bafdd4639399532a1b5e6815be8
-DIST frobtads-1.2.3.tar.gz 5227704 BLAKE2B fd481201da6dbddf3b0f5adf7c600282c9500bd65cebebf13e23b139ca1e9793091c6df50bebebed179c6f775d188c8ccbe8450d0058863c55dd322e8a92ce32 SHA512 4efb888860edda24bb5a5812967d0b863614558e9839cf0cfabc649ab0175719bf663de5e725034ba160c015d269dbe2df046cf47ad1019e668bf5b1fb564d7d
+AUX frobtads-1.2.4-tinfo.patch 345 BLAKE2B cf4ffb8870f064aac6d302c5dd4dcaea4a1ee1cc7aacc1d74b299f18de25b2150571ecc468cb1ba326680402c7cf99b95d4f0dc78959a5a7d4209e53f56d66df SHA512 632b599b115cc73c3642e8462fd916146e2451be47b44c43860f5dc87bc6c510eabc62f4d575b814eee55e89e99f03b3a445d60e45dc6cc8d60052835ccac685
 DIST frobtads-1.2.4.tar.bz2 3801366 BLAKE2B 871a4cfd432f1a72915de0652def2f2a9a3cf1bfa20b070c2e59ced673c736584a36b3d17e7d5812ad7cd883c3e038e49f962635a5794d6c914d99651bfd0a55 SHA512 f49f58114cbd78f23fcc3835025af7874da968af825abd449e9ab83c4a90e8d70f8cfafa83780f0631ae9bd2793cce2d5dd947c13ee38ba0d06829d2803abf12
-EBUILD frobtads-1.2.3-r1.ebuild 1084 BLAKE2B 3b4ac366d3b1730473a251261f0c08f24ae8b5c3a9e70fe9f359574a409c2f8f4b62806c92f48ae26c2e5998933a64c098940c33050961ce93becc5c48495c18 SHA512 8f7b51246acedd865d9a396819545964fbcfc69f61c8381b0da2387fb8695fe9655d07097d448a74a8a3606ff3b9f32c738f829e9942ee8bdfc8b332f435c909
-EBUILD frobtads-1.2.4.ebuild 1155 BLAKE2B 5daae9b4da5e7545fc3140bae70fad36a0ffc3db179c68fa36bd88db341cc1603a6789aa73c9bfe0580c04c57a4025d502d1c98624b1e8c53cd718c35ff49a8c SHA512 c8f29e693069df59125c2495c74817b3362d84f86daef3c3a2abfaa0f8f4ab91271be1413c9164cd25988f40d05a83fdf3ebe3b9dc66538beeeb61bd75be55fc
+EBUILD frobtads-1.2.4.ebuild 1166 BLAKE2B 85b02bc732f16d376b386443a8962678054c0bfa828ad124d356f67961ffedcefc4ad616326807eec85a675b58a3cfe6817eb7ce23fc5f7be61b4e0d3e2f8957 SHA512 d52c491d53070b64116bbb08b25ded057b13e25c7af1483ec505bf2c63fa4dd2d9dae7fd890b96f5b0a21a290ca4f07dbd0307e22c2c1782f00df1bd65f6ee1b
 MISC metadata.xml 394 BLAKE2B db39dd99a448935896847c3ce0c824a3043d65d82e7d35cad3afab2538aebffca96c532f83182bf2e28fab22fcb0d6145e6e5a383def6d956db6d0558e73f481 SHA512 591c0df18a2e4e1469e1f95dce9c74f3b66261377b88ec9dde79c56094253a5579427a2fa836fb1c2926344b95a471b7d13bda4a53f4c6a064b06c61d89e1ab3
diff --git a/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch b/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch
index c50b5a05de43..f37f2ed22ce2 100644
--- a/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch
+++ b/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/602446
 
---- frobtads-1.2.4/configure.ac
-+++ frobtads-1.2.4/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -88,6 +88,7 @@
  # doesn't hust to try pdcurses as a last resort.)
  #
diff --git a/games-engines/frobtads/frobtads-1.2.3-r1.ebuild b/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
deleted file mode 100644
index 7b35a8571c33..000000000000
--- a/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures"
-HOMEPAGE="http://www.tads.org/frobtads.htm"
-SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz"
-
-LICENSE="TADS2 TADS3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tads2compiler tads3compiler"
-
-RESTRICT="!tads3compiler? ( test )"
-
-RDEPEND="net-misc/curl
-	sys-libs/ncurses:0"
-DEPEND=${RDEPEND}
-
-DOCS=( doc/{AUTHORS,BUGS,ChangeLog.old,NEWS,README,SRC_GUIDELINES,THANKS} )
-
-src_configure() {
-	append-cxxflags -fpermissive
-	append-libs $(curl-config --libs)
-	econf \
-		$(use_enable debug error-checking) \
-		$(use_enable debug t3debug) \
-		$(use_enable tads2compiler t2-compiler) \
-		$(use_enable tads3compiler t3-compiler)
-}
-
-src_test() {
-	emake -j1 sample
-	./frob -i plain -p samples/sample.t3 <<- END_FROB_TEST
-		save
-		testsave.sav
-		restore
-		testsave.sav
-	END_FROB_TEST
-	[[ $? -eq 0 ]] || die "Failed to run test game"
-}
-
-src_install() {
-	default
-}
diff --git a/games-engines/frobtads/frobtads-1.2.4.ebuild b/games-engines/frobtads/frobtads-1.2.4.ebuild
index f0fd3816a632..6270e7fa08f6 100644
--- a/games-engines/frobtads/frobtads-1.2.4.ebuild
+++ b/games-engines/frobtads/frobtads-1.2.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -16,8 +16,10 @@ IUSE="debug tads2compiler tads3compiler"
 
 RESTRICT="!tads3compiler? ( test )"
 
-RDEPEND="net-misc/curl
-	sys-libs/ncurses:0="
+RDEPEND="
+	net-misc/curl
+	sys-libs/ncurses:0=
+"
 DEPEND="${RDEPEND}"
 
 DOCS=( doc/{AUTHORS,BUGS,ChangeLog.old,NEWS,README,SRC_GUIDELINES,THANKS} )
@@ -28,7 +30,9 @@ PATCHES=(
 
 src_prepare() {
 	default
-	eautoreconf #602446
+
+	# bug #602446
+	eautoreconf
 }
 
 src_configure() {