gentoo resync : 25.08.2020

3 files changed, 18 insertions, 72 deletions

diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 975aa0c829b0..c5451d4ccc07 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,6 +1,4 @@
 AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a8a1dd025bfa872bd78cc31f05c01b2d559f619f3f1f15dd9f26a66d192410fc5404a5b0afee636cd33603112535500d07459 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3
-DIST scummvm-tools-1.8.0.tar.xz 864048 BLAKE2B 7e3184bda33c582708be204493cd99504ef7286305ba01d052a95bf317c56630109e963ecd8d26d4f8868bb75e5b0cb22154fe4cb794a01dabe25b11568babbb SHA512 eed0aa0cceef59c42aabe94fe382a4494085c479d310cb624131746a1cbacc37d4a43603a5321167eb5fd4d9d8235fc794bdca5a3417fc4d224213e5409347ed
-DIST scummvm-tools-2.0.0.tar.xz 866668 BLAKE2B 51e6a771f0b1902f9cadc1e84da4b97aa42bc810c781ba238b3dad9ce242792d0de805e6d129607bace36b7a3cb8dc7a7a1a6fd13211320afe6546569b49f0ff SHA512 a4c645f2a05b5f208658bad1a3122115a3077809141f5d4b281414ca32854d14987a8b6d4579f3bdd9d3eeeab880d98e3b540c3f69155197f20a2094a7812c60
-EBUILD scummvm-tools-1.8.0-r1.ebuild 1293 BLAKE2B ad9de8698cb7425d52604728ab28e2acf5745dd8ac5ab5fcf4507e71d9736e9343690e947f86783ff863489f59d32d2c1cf268da6086edf7855c6718b59bf22f SHA512 5bb3ce04e3a5c2ec120e7d87461b142bf46c8e69d317ce7ca38c137c2cdfa489fd977aa1d778196b468534b866ecd2ee0b4709d97bdee543c35813f56420a1e4
-EBUILD scummvm-tools-2.0.0-r1.ebuild 1323 BLAKE2B ded0c34d029a8d41c99ad38919af5614e9bea5252d98a2ffded8d218717851937552fe7955a9e33ab9ee43465cc626bbc14597697ce35fa6030649f416475212 SHA512 4eec3a6492f2849204fdea7f6f0091de06cba0cefbdd74b386ec9d69d408a0b2a163f2e7d9c9d3fd61808d0a79ee79460cae44ded9eba161253875e25ad7ccb5
+DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136 SHA512 40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15
+EBUILD scummvm-tools-2.1.0.ebuild 1322 BLAKE2B 1d99ef88962b88e3e812f130a65da23642f9e84e726b02b142d788d3962cf812f79efb3ee3e0a7c1d7ca3dd6c38761ba980f10b3eb924617c054a87bb842a2c7 SHA512 590b55fd52a3af2233d2140f45450f2c89907319198789aece4469113d6291f96ec067558db7dc90d0beb42a051cd0012807afa3fd250567f114dee527678e4c
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
deleted file mode 100644
index 2a3b2686c5a6..000000000000
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-inherit wxwidgets eutils flag-o-matic
-
-DESCRIPTION="utilities for the SCUMM game engine"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="flac iconv mad png vorbis"
-RESTRICT="test" # some tests require external files
-
-RDEPEND=">=dev-libs/boost-1.32:=
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}
-	flac? ( media-libs/flac )
-	iconv? ( virtual/libiconv media-libs/freetype:2 )
-	mad? ( media-libs/libmad )
-	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-binprefix.patch"
-)
-
-src_prepare() {
-	default
-
-	need-wxwidgets unicode
-	rm -rf *.bat dists/win32 || die
-	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
-}
-
-src_configure() {
-	# Not an autoconf script
-	./configure \
-		--disable-tremor \
-		--enable-verbose-build \
-		--mandir=/usr/share/man \
-		$(use_enable flac) \
-		$(use_enable iconv) \
-		$(use_enable iconv freetype) \
-		$(use_enable mad) \
-		$(use_enable png) \
-		$(use_enable vorbis) || die
-}
-
-src_install() {
-	EXEPREFIX="${PN}-" default
-}
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
index 4cf673ee91bb..54cbb5e6684d 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-WX_GTK_VER=3.0
+EAPI=7
+WX_GTK_VER=3.0-gtk3
 inherit wxwidgets eutils flag-o-matic
 
 DESCRIPTION="utilities for the SCUMM game engine"
@@ -15,17 +15,22 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files
 
-RDEPEND=">=dev-libs/boost-1.32:=
+RDEPEND="
+	>=dev-libs/boost-1.32:=
 	sys-libs/zlib
 	x11-libs/wxGTK:${WX_GTK_VER}
 	flac? ( media-libs/flac )
 	iconv? ( virtual/libiconv media-libs/freetype:2 )
 	mad? ( media-libs/libmad )
-	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
+	png? ( media-libs/libpng:0= )
+	vorbis? ( media-libs/libvorbis )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.0-binprefix.patch"
@@ -34,12 +39,13 @@ PATCHES=(
 src_prepare() {
 	default
 
-	need-wxwidgets unicode
 	rm -rf *.bat dists/win32 || die
 	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
 }
 
 src_configure() {
+	setup-wxwidgets
+
 	# Not an autoconf script
 	./configure \
 		--prefix=/usr \