[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm-tools/, games-engines/scummvm-tools/files/

[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm-tools/, games-engines/scummvm-tools/files/

[David Seifert]

commit:     d16e6562ac67ff2a4daf45db371e97d9621e6fd9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 15:50:45 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 16:21:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16e6562

games-engines/scummvm-tools: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3564

 games-engines/scummvm-tools/Manifest               |  1 -
 .../files/scummvm-tools-1.7.0-binprefix.patch      | 11 ----
 .../scummvm-tools/scummvm-tools-1.7.0-r1.ebuild    | 58 ----------------------
 3 files changed, 70 deletions(-)

diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 248076b..4f0e927 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,2 +1 @@
-DIST scummvm-tools-1.7.0.tar.bz2 956801 SHA256 b4005c3d68e4c5bda4fa9e31f3998fc5b45b7c9381890ed3d5f0b57f77a62589 SHA512 6a04307912327cb91fb4e1689b67ce621c3e28cbd5460c20974384907d21cb266e9d00b74a6991813366d2c34f966d79dc12e71750d083c82b89a2ec654b04b1 WHIRLPOOL 2034eb3817b5e11b0ba626f2b2b88a2e29a973e538f7a43cafffa0247792c4292821dfa20decd18842155938a65cb74af35b18dbf5d0da61b2d4c18e1b1dc2fc
 DIST scummvm-tools-1.8.0.tar.xz 864048 SHA256 2c14050cee3fb8e178cb9ff16a4412ab584001757b4824c75b24240eb2d98bdd SHA512 eed0aa0cceef59c42aabe94fe382a4494085c479d310cb624131746a1cbacc37d4a43603a5321167eb5fd4d9d8235fc794bdca5a3417fc4d224213e5409347ed WHIRLPOOL a16fd22cda96b1c633a5c0b70cbfc9393ece6ac4da8f52393e2041cafe2091fb1b57f006ec507f320f69a172c3e522faed521047379ba2c154541070173a348a

diff --git a/games-engines/scummvm-tools/files/scummvm-tools-1.7.0-binprefix.patch b/games-engines/scummvm-tools/files/scummvm-tools-1.7.0-binprefix.patch
deleted file mode 100644
index 604db07..00000000
--- a/games-engines/scummvm-tools/files/scummvm-tools-1.7.0-binprefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scummvm-tools-1.7.0.orig/Makefile.common
-+++ scummvm-tools-1.7.0/Makefile.common
-@@ -312,7 +312,7 @@
- install: $(TARGETS)
- 	$(INSTALL) -p -m 0755 -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -p -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
--	for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; done
-+	for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR)/$(EXEPREFIX)$$i ; done
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
- 	$(INSTALL) -p -m 0644 $(srcdir)/gui/media/*.* $(DESTDIR)$(DATADIR)/scummvm-tools
- 

diff --git a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
deleted file mode 100644
index 6b64dc3..00000000
--- a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER=3.0
-inherit wxwidgets eutils flag-o-matic games
-
-DESCRIPTION="utilities for the SCUMM game engine"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/scummvm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="flac iconv mad png vorbis"
-RESTRICT="test" # some tests require external files
-
-RDEPEND="png? ( media-libs/libpng:0 )
-	mad? ( media-libs/libmad )
-	flac? ( media-libs/flac )
-	vorbis? ( media-libs/libvorbis )
-	iconv? ( virtual/libiconv media-libs/freetype:2 )
-	sys-libs/zlib
-	>=dev-libs/boost-1.32
-	x11-libs/wxGTK:${WX_GTK_VER}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	need-wxwidgets unicode
-	rm -rf *.bat dists/win32
-	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
-	epatch "${FILESDIR}/${P}-binprefix.patch"
-}
-
-src_configure() {
-	# Not an autoconf script
-	./configure \
-		--enable-verbose-build \
-		--mandir=/usr/share/man \
-		--prefix="${GAMES_PREFIX}" \
-		--libdir="${GAMES_PREFIX}/lib" \
-		--datadir="${GAMES_DATADIR}" \
-		--disable-tremor \
-		$(use_enable flac) \
-		$(use_enable iconv) \
-		$(use_enable iconv freetype) \
-		$(use_enable mad) \
-		$(use_enable png) \
-		$(use_enable vorbis) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" EXEPREFIX="${PN}-" install
-	dodoc README TODO
-	prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm-tools/, games-engines/scummvm-tools/files/

[Ionen Wolkens]

commit:     f18190f1c6a974bb606e30c3b0d0f71dd041f391
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Tue Sep  7 20:49:32 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 00:03:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18190f1

games-engines/scummvm-tools: Fix build without native symlinks

Closes: https://bugs.gentoo.org/744424
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/22228
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/scummvm-tools-2.2.0-strings.patch             | 17 +++++++++++++++++
 games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild  | 13 +++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch
new file mode 100644
index 00000000000..1bd3f9f399d
--- /dev/null
+++ b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch
@@ -0,0 +1,17 @@
+Fix build without native symlinks
+https://bugs.gentoo.org/744424
+
+--- a/configure
++++ b/configure
+@@ -1026,9 +1026,9 @@ void _ebcdic() { char* s = (char*) ebcdi
+ int main() { _ascii (); _ebcdic (); return 0; }
+ EOF
+ $CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp
+-if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
++if ${STRINGS} $TMPO.o | grep BIGenDianSyS >/dev/null; then
+ 	_endian=big
+-elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
++elif ${STRINGS} $TMPO.o | grep LiTTleEnDian >/dev/null; then
+ 	_endian=little
+ fi
+ echo $_endian;

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
index c514a09b8b7..3af45ddd2fa 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER=3.0-gtk3
 inherit wxwidgets toolchain-funcs
@@ -17,7 +17,7 @@ IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files
 
 RDEPEND="
-	>=dev-libs/boost-1.32:=
+	dev-libs/boost:=
 	sys-libs/zlib
 	x11-libs/wxGTK:${WX_GTK_VER}
 	flac? ( media-libs/flac )
@@ -35,17 +35,18 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.0-binprefix.patch"
+	"${FILESDIR}/${PN}-2.2.0-strings.patch"
 )
 
 src_prepare() {
 	default
 
-	rm -rf *.bat dists/win32 || die
-	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
+	rm -r *.bat dists/win32 || die
 }
 
 src_configure() {
 	setup-wxwidgets
+	tc-export CXX STRINGS
 
 	# Not an autoconf script
 	./configure \
@@ -61,10 +62,6 @@ src_configure() {
 		$(use_enable vorbis) || die
 }
 
-src_compile() {
-	emake STRINGS="$(tc-getSTRINGS)"
-}
-
 src_install() {
 	EXEPREFIX="${PN}-" default
 }