subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: games\-engines\/scummvm\/"

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

2024-05-23 Thread Matt Turner

commit: e0a950db839273709d64ba63faa0a0792dc6bd66
Author: Matt Turner  gentoo  org>
AuthorDate: Thu May 23 15:28:28 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu May 23 16:09:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a950db

games-engines/scummvm: Depend on libglvnd, not mesa

Signed-off-by: Matt Turner  gentoo.org>

 .../scummvm/{scummvm-2.8.0.ebuild => scummvm-2.8.0-r1.ebuild}  | 3 +--
 .../scummvm/{scummvm-2.8.1.ebuild => scummvm-2.8.1-r1.ebuild}  | 3 +--
 games-engines/scummvm/scummvm-.ebuild  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/games-engines/scummvm/scummvm-2.8.0.ebuild 
b/games-engines/scummvm/scummvm-2.8.0-r1.ebuild
similarity index 98%
rename from games-engines/scummvm/scummvm-2.8.0.ebuild
rename to games-engines/scummvm/scummvm-2.8.0-r1.ebuild
index 4f5504d6ddf4..9adbe73bf3b8 100644
--- a/games-engines/scummvm/scummvm-2.8.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.8.0-r1.ebuild
@@ -48,8 +48,7 @@ DEPEND="
opengl? (
|| (
virtual/opengl
-   media-libs/mesa[gles2]
-   media-libs/mesa[gles1]
+   media-libs/libglvnd
)
)
png? ( media-libs/libpng:0 )

diff --git a/games-engines/scummvm/scummvm-2.8.1.ebuild 
b/games-engines/scummvm/scummvm-2.8.1-r1.ebuild
similarity index 98%
rename from games-engines/scummvm/scummvm-2.8.1.ebuild
rename to games-engines/scummvm/scummvm-2.8.1-r1.ebuild
index 3690afa59cdb..062895592e49 100644
--- a/games-engines/scummvm/scummvm-2.8.1.ebuild
+++ b/games-engines/scummvm/scummvm-2.8.1-r1.ebuild
@@ -48,8 +48,7 @@ DEPEND="
opengl? (
|| (
virtual/opengl
-   media-libs/mesa[gles2]
-   media-libs/mesa[gles1]
+   media-libs/libglvnd
)
)
png? ( media-libs/libpng:0 )

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-.ebuild
index d678e3432dbb..826f0cc2b782 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-.ebuild
@@ -48,8 +48,7 @@ DEPEND="
opengl? (
|| (
virtual/opengl
-   media-libs/mesa[gles2]
-   media-libs/mesa[gles1]
+   media-libs/libglvnd
)
)
png? ( media-libs/libpng:0 )

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

2024-03-21 Thread Sam James

commit: c5bae0eccbd80a162b0ac3f0abb31d5501e17b16
Author: Eli Schwartz  gmail  com>
AuthorDate: Fri Mar 22 02:08:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 22 05:31:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5bae0ec

games-engines/scummvm-tools: mark as LTO-unsafe, strict-aliasing unsafe

Closes: https://bugs.gentoo.org/926081
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild
index d06380eb0491..a07c2c9e3434 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 WX_GTK_VER="3.2-gtk3"
 
-inherit desktop toolchain-funcs wxwidgets xdg
+inherit desktop flag-o-matic toolchain-funcs wxwidgets xdg
 
 DESCRIPTION="Utilities for the SCUMM game engine"
 HOMEPAGE="https://www.scummvm.org/;
@@ -51,6 +51,12 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing, -Werror=odr
+   # https://bugs.gentoo.org/926081
+   # https://bugs.scummvm.org/ticket/15039
+   append-flags -fno-strict-aliasing
+   filter-lto
+
setup-wxwidgets
tc-export CXX STRINGS

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

2024-03-16 Thread Michał Górny

commit: a3e07402dcbfdbc44a9998a10bceaa6055ab72bf
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Mar 16 06:10:22 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar 16 06:54:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e07402

games-engines/scummvm: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest|   5 -
 games-engines/scummvm/metadata.xml|   1 -
 games-engines/scummvm/scummvm-2.5.1-r1.ebuild | 140 -
 games-engines/scummvm/scummvm-2.6.0-r1.ebuild | 138 -
 games-engines/scummvm/scummvm-2.6.1.ebuild| 142 --
 games-engines/scummvm/scummvm-2.7.0.ebuild| 142 --
 games-engines/scummvm/scummvm-2.7.1.ebuild| 142 --
 7 files changed, 710 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 8dd83a6e20fd..b86ab1703f2f 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1 @@
-DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 
08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d
 SHA512 
5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03
-DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 
38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80
 SHA512 
6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69
-DIST scummvm-2.6.1.tar.xz 141354456 BLAKE2B 
b54001a53b3c899831745c94b1bf6020b462dfd49f6de35a609a6977846e7d036ee6c323c888c88379f4b6149dad31a1af5a38ae8d5231303dbba6a0ba97bb2f
 SHA512 
984e35683ec4fa6a0715a20027d471ff432a2da060caf1b28557e42ae7b2b5c3b32c3ef4f3c1fb0ac9bcde69d01f789b3054fe9b0ddb0fe9fadbee462c1afcc5
-DIST scummvm-2.7.0.tar.xz 145171776 BLAKE2B 
0f208919ca64cef56e513988635e02c84e5ce85cd328687bd566d17daee5a1386dd7986649655670117e3c211f10566b14f2a0b43bf3fe54ba68c542681b8a31
 SHA512 
099afbde36f73eec26059f63b541cf79dde7debf7068fb4fa4efd3ad09eecfccb57c92f0a21d120c56c6821e45133e0ca02e138beed98c16f2b273a965411271
-DIST scummvm-2.7.1.tar.xz 148127416 BLAKE2B 
a74ede3ea8e128d2ab28cac897ef372c1bbcb79de8afdb86c1d30323ddc4c23f72a2f98ee4023d548961d339b89362c50e7e58e358a00a3017950f5bd0e93774
 SHA512 
7fcefb849822c84df3f8c9b8c91c8ea15cdd4597404c927fda3b2ba0a6a18e82917be9511244d8ba8f693df8bfa2d368bdebdd4caaa9905007ce0463cc693760
 DIST scummvm-2.8.0.tar.xz 207362400 BLAKE2B 
2e0354189bfa50b5af87c9019400c114c7fd3072afeb6cee50c230d27171ae109552c855b07f027769c10f6f325dafd77c56fa17b1c5a61b11ece3c1f54efe53
 SHA512 
e4e728a668fe3c1b161b56ff788011673766e7429bc27bafb2b4a7f724093b719f7fd47f0995f1db5dad42ecf3ee260fe51d549f85eb2a68862b799962c34632

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index afba7a09f48a..1e66116903bf 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -12,7 +12,6 @@
   
 compile with support for fluidsynth
 Support for right-to-left languages via 
dev-libs/fribidi
-enable support for OpenGL Extension Wrangler Library 
(media-libs/glew)
 enable mpeg2 codec for cutscenes
 enable cloud support via 
media-libs/sdl2-net
 Enable support for MIDI music using 
media-sound/sndio

diff --git a/games-engines/scummvm/scummvm-2.5.1-r1.ebuild 
b/games-engines/scummvm/scummvm-2.5.1-r1.ebuild
deleted file mode 100644
index 67c4d1dee981..
--- a/games-engines/scummvm/scummvm-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="https://www.scummvm.org/;
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/scummvm/scummvm;
-else
-   SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-   S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 
mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND="
-   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
-   a52? ( media-libs/a52dec )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   flac? ( media-libs/flac:= )
-   fluidsynth? ( media-sound/fluidsynth:= )
-   fribidi? ( dev-libs/fribidi )
-   gif?

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

2024-03-16 Thread Michał Górny

commit: 87b7d7d21fa3dc09874640ceaeb9da5dcfd3e28b
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Mar 16 06:11:53 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar 16 06:54:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b7d7d2

games-engines/scummvm: Bump to 2.8.1

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-2.8.1.ebuild | 142 +
 2 files changed, 143 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index b86ab1703f2f..98935df3170b 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1 +1,2 @@
 DIST scummvm-2.8.0.tar.xz 207362400 BLAKE2B 
2e0354189bfa50b5af87c9019400c114c7fd3072afeb6cee50c230d27171ae109552c855b07f027769c10f6f325dafd77c56fa17b1c5a61b11ece3c1f54efe53
 SHA512 
e4e728a668fe3c1b161b56ff788011673766e7429bc27bafb2b4a7f724093b719f7fd47f0995f1db5dad42ecf3ee260fe51d549f85eb2a68862b799962c34632
+DIST scummvm-2.8.1.tar.xz 207711376 BLAKE2B 
716503fbbd736e522918203400ccf777bc24a8e43c8c030c0e86d9c4f3c3da3f0c580269781fe030901e06854d43e2ed2f6ec9bc4e269c4d4dde8d3e08f494f2
 SHA512 
aef6c7b83f087cf0742dcd1f896f5706e2408e54c4c902e75f03e69f4c5475b1d33a2149246646afb96c02aa2e85ba93995dff732b3aa84338b7bc96c62b802c

diff --git a/games-engines/scummvm/scummvm-2.8.1.ebuild 
b/games-engines/scummvm/scummvm-2.8.1.ebuild
new file mode 100644
index ..3690afa59cdb
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.8.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+else
+   SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+   S=${WORKDIR}/${P/_/}
+fi
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+IUSE="
+   a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
+   mp3 +net opengl png sndio speech theora truetype unsupported vorbis
+   zlib
+"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+DEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac:= )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   fribidi? ( dev-libs/fribidi )
+   gif? ( media-libs/giflib )
+   gtk? (
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   net? (
+   media-libs/sdl2-net
+   net-misc/curl
+   )
+   opengl? (
+   || (
+   virtual/opengl
+   media-libs/mesa[gles2]
+   media-libs/mesa[gles1]
+   )
+   )
+   png? ( media-libs/libpng:0 )
+   sndio? ( media-sound/sndio:= )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+   ${DEPEND}
+"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+   tc-export STRINGS
+
+   local myconf=(
+   --backend=sdl
+   --host=${CHOST}
+   --enable-verbose-build
+   --prefix="${EPREFIX}/usr"
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   --opengl-mode=$(usex opengl auto none)
+   --with-sdl-prefix="${EPREFIX}/usr"
+   $(use_enable a52)
+   $(use_enable aac faad)
+   $(use_enable alsa)
+   $(use_enable debug)
+   $(use_enable !debug release-mode)
+   $(use_enable flac)
+   $(usex fluidsynth '' --disable-fluidsynth)
+   $(use_enable fribidi)
+   $(use_enable gif)
+   $(use_enable gtk)
+

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

2023-12-16 Thread Michał Górny

commit: fc760101de329cec4b63c05d451cc490b62a5387
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 06:57:00 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Dec 17 06:57:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc760101

games-engines/scummvm: Bump to 2.8.0

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-2.8.0.ebuild | 142 +
 2 files changed, 143 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index dec8c274a0ba..8dd83a6e20fd 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -3,3 +3,4 @@ DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 
38cdce3e9b7954347d3ba05946c607aa5a62
 DIST scummvm-2.6.1.tar.xz 141354456 BLAKE2B 
b54001a53b3c899831745c94b1bf6020b462dfd49f6de35a609a6977846e7d036ee6c323c888c88379f4b6149dad31a1af5a38ae8d5231303dbba6a0ba97bb2f
 SHA512 
984e35683ec4fa6a0715a20027d471ff432a2da060caf1b28557e42ae7b2b5c3b32c3ef4f3c1fb0ac9bcde69d01f789b3054fe9b0ddb0fe9fadbee462c1afcc5
 DIST scummvm-2.7.0.tar.xz 145171776 BLAKE2B 
0f208919ca64cef56e513988635e02c84e5ce85cd328687bd566d17daee5a1386dd7986649655670117e3c211f10566b14f2a0b43bf3fe54ba68c542681b8a31
 SHA512 
099afbde36f73eec26059f63b541cf79dde7debf7068fb4fa4efd3ad09eecfccb57c92f0a21d120c56c6821e45133e0ca02e138beed98c16f2b273a965411271
 DIST scummvm-2.7.1.tar.xz 148127416 BLAKE2B 
a74ede3ea8e128d2ab28cac897ef372c1bbcb79de8afdb86c1d30323ddc4c23f72a2f98ee4023d548961d339b89362c50e7e58e358a00a3017950f5bd0e93774
 SHA512 
7fcefb849822c84df3f8c9b8c91c8ea15cdd4597404c927fda3b2ba0a6a18e82917be9511244d8ba8f693df8bfa2d368bdebdd4caaa9905007ce0463cc693760
+DIST scummvm-2.8.0.tar.xz 207362400 BLAKE2B 
2e0354189bfa50b5af87c9019400c114c7fd3072afeb6cee50c230d27171ae109552c855b07f027769c10f6f325dafd77c56fa17b1c5a61b11ece3c1f54efe53
 SHA512 
e4e728a668fe3c1b161b56ff788011673766e7429bc27bafb2b4a7f724093b719f7fd47f0995f1db5dad42ecf3ee260fe51d549f85eb2a68862b799962c34632

diff --git a/games-engines/scummvm/scummvm-2.8.0.ebuild 
b/games-engines/scummvm/scummvm-2.8.0.ebuild
new file mode 100644
index ..4f5504d6ddf4
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.8.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+else
+   SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+   S=${WORKDIR}/${P/_/}
+fi
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+IUSE="
+   a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
+   mp3 +net opengl png sndio speech theora truetype unsupported vorbis
+   zlib
+"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+DEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac:= )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   fribidi? ( dev-libs/fribidi )
+   gif? ( media-libs/giflib )
+   gtk? (
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   net? (
+   media-libs/sdl2-net
+   net-misc/curl
+   )
+   opengl? (
+   || (
+   virtual/opengl
+   media-libs/mesa[gles2]
+   media-libs/mesa[gles1]
+   )
+   )
+   png? ( media-libs/libpng:0 )
+   sndio? ( media-sound/sndio:= )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+   ${DEPEND}
+"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+   tc-export STRINGS
+
+   local

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

2023-11-24 Thread Pacho Ramos

commit: de3e041e1047b8474bc603aa270af0a18ab05157
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Nov 24 13:05:29 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Nov 24 13:07:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3e041e

games-engines/scummvm-tools: add 2.7.0_p1

Closes: https://bugs.gentoo.org/858734
Closes: https://bugs.gentoo.org/906876
Signed-off-by: Pacho Ramos  gentoo.org>

 games-engines/scummvm-tools/Manifest   |  3 +
 .../files/scummvm-tools-2.7.0-endianess.patch  | 27 
 games-engines/scummvm-tools/metadata.xml   |  3 +
 .../scummvm-tools/scummvm-tools-2.7.0_p1.ebuild| 81 ++
 4 files changed, 114 insertions(+)

diff --git a/games-engines/scummvm-tools/Manifest 
b/games-engines/scummvm-tools/Manifest
index c42f54febae1..04fcb1ff0575 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1 +1,4 @@
 DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B 
bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e
 SHA512 
97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89
+DIST scummvm-tools-2.7.0.tar.xz 1286572 BLAKE2B 
bcb58267a9c04849ab3145f2d5a657b9e1ec6c2bb9e59bbf47ae6aae842385e70d0417f92ca4018786cf91f8c607a5fe1246f846dc496318b01ec51bd059358b
 SHA512 
0f6541f86814a089b10969e8e0cc8c985ac4d3b5f15daf91869a9b9cc748d7b6c668ffd428c1f0726ff9a1fb5cc7b496098481778cbf41203a7eb3077a189ce7
+DIST scummvm-tools_2.7.0-1.debian.tar.xz 10212 BLAKE2B 
9805222166f30d1535642958ac74984968dd19bfa3b7a159b61509215fd29d370a9393d0a25e4dfd041ee83feb9fffb55f5f705d76ac03de95d925718166c263
 SHA512 
f7234e58312f7979b9f87940020d9815429a24be6083e8ed61ef14c342c83edfb00f2f9d130e2a18b34099c3a20df3093556b017f28a40a1f8d8037ad8d99bed
+DIST scummvm-tools_512.png 56989 BLAKE2B 
8173b580a542d78a4dcb859f8ba008af8f5dcd707c6213a3fc961dc5f8bbe02f3e67beafbaceff8ffb75a26d0a1c441642a103c1607b7c776b6da6c803545a47
 SHA512 
94d0cd2ccb7ac7ea1ca20ba208908ac05e064470f260e3347aec2aa457f1cf281c6bc88056e14001a1f93422f9cdfb732c53262d8067a4c487a57396b510fd7f

diff --git 
a/games-engines/scummvm-tools/files/scummvm-tools-2.7.0-endianess.patch 
b/games-engines/scummvm-tools/files/scummvm-tools-2.7.0-endianess.patch
new file mode 100644
index ..6752914d2c2b
--- /dev/null
+++ b/games-engines/scummvm-tools/files/scummvm-tools-2.7.0-endianess.patch
@@ -0,0 +1,27 @@
+# 
https://src.fedoraproject.org/rpms/scummvm-tools/raw/rawhide/f/configure.patch
+diff -uNr scummvm-tools-2.5.0.old/configure scummvm-tools-2.5.0/configure
+--- scummvm-tools-2.5.0.old/configure  2021-10-01 13:59:48.0 +0200
 scummvm-tools-2.5.0/configure  2021-12-14 23:01:39.604582839 +0100
+@@ -1047,15 +1047,15 @@
+ #
+ echo_n "Checking endianness... "
+ cat > tmp_endianness_check.cpp << EOF
+-unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 
0 };
+-unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 
0 };
+-void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; }
+-unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 
0x9581, 0 };
+-unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 
0xA8E2, 0 };
+-void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; }
++__attribute__ ((used)) unsigned short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 
0x6961, 0x6E53, 0x7953, 0 };
++__attribute__ ((used)) unsigned short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 
0x6E45, 0x6944, 0x6E61, 0 };
++__attribute__ ((used)) void _ascii() { char* s = (char*) ascii_mm; s = 
(char*) ascii_ii; }
++__attribute__ ((used)) unsigned short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 
0x95C5, 0x89C4, 0x9581, 0 };
++__attribute__ ((used)) unsigned short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 
0x8981, 0x95E2, 0xA8E2, 0 };
++__attribute__ ((used)) void _ebcdic() { char* s = (char*) ebcdic_mm; s = 
(char*) ebcdic_ii; }
+ int main() { _ascii (); _ebcdic (); return 0; }
+ EOF
+-$CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp
++$CXX $CXXFLAGS -ffat-lto-objects -c -o $TMPO.o tmp_endianness_check.cpp
+ if $_strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
+   _endian=big
+ elif $_strings $TMPO.o | grep LiTTleEnDian >/dev/null; then

diff --git a/games-engines/scummvm-tools/metadata.xml 
b/games-engines/scummvm-tools/metadata.xml
index e6b8e4e911e0..798292735601 100644
--- a/games-engines/scummvm-tools/metadata.xml
+++ b/games-engines/scummvm-tools/metadata.xml
@@ -8,4 +8,7 @@

scummvm

+   
+   Enable tremor, a fixed-point version of the 
Ogg Vorbis decoder
+   
 

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.7.0_p1.ebuild
new file mode 100644
index

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

2023-07-14 Thread Michał Górny

commit: 39e61d9371f767b6ec008bfb8e151e014f6f49d5
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul 15 01:49:01 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul 15 03:04:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e61d93

games-engines/scummvm: Bump to 2.7.1

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-2.7.1.ebuild | 142 +
 2 files changed, 143 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 16aa3aefc916..dec8c274a0ba 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -2,3 +2,4 @@ DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 
08fb2fa6cbeec3c1ec24a9b660aab4344f0d
 DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 
38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80
 SHA512 
6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69
 DIST scummvm-2.6.1.tar.xz 141354456 BLAKE2B 
b54001a53b3c899831745c94b1bf6020b462dfd49f6de35a609a6977846e7d036ee6c323c888c88379f4b6149dad31a1af5a38ae8d5231303dbba6a0ba97bb2f
 SHA512 
984e35683ec4fa6a0715a20027d471ff432a2da060caf1b28557e42ae7b2b5c3b32c3ef4f3c1fb0ac9bcde69d01f789b3054fe9b0ddb0fe9fadbee462c1afcc5
 DIST scummvm-2.7.0.tar.xz 145171776 BLAKE2B 
0f208919ca64cef56e513988635e02c84e5ce85cd328687bd566d17daee5a1386dd7986649655670117e3c211f10566b14f2a0b43bf3fe54ba68c542681b8a31
 SHA512 
099afbde36f73eec26059f63b541cf79dde7debf7068fb4fa4efd3ad09eecfccb57c92f0a21d120c56c6821e45133e0ca02e138beed98c16f2b273a965411271
+DIST scummvm-2.7.1.tar.xz 148127416 BLAKE2B 
a74ede3ea8e128d2ab28cac897ef372c1bbcb79de8afdb86c1d30323ddc4c23f72a2f98ee4023d548961d339b89362c50e7e58e358a00a3017950f5bd0e93774
 SHA512 
7fcefb849822c84df3f8c9b8c91c8ea15cdd4597404c927fda3b2ba0a6a18e82917be9511244d8ba8f693df8bfa2d368bdebdd4caaa9905007ce0463cc693760

diff --git a/games-engines/scummvm/scummvm-2.7.1.ebuild 
b/games-engines/scummvm/scummvm-2.7.1.ebuild
new file mode 100644
index ..4f5504d6ddf4
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.7.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+else
+   SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+   S=${WORKDIR}/${P/_/}
+fi
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+IUSE="
+   a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
+   mp3 +net opengl png sndio speech theora truetype unsupported vorbis
+   zlib
+"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+DEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac:= )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   fribidi? ( dev-libs/fribidi )
+   gif? ( media-libs/giflib )
+   gtk? (
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   net? (
+   media-libs/sdl2-net
+   net-misc/curl
+   )
+   opengl? (
+   || (
+   virtual/opengl
+   media-libs/mesa[gles2]
+   media-libs/mesa[gles1]
+   )
+   )
+   png? ( media-libs/libpng:0 )
+   sndio? ( media-sound/sndio:= )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+   ${DEPEND}
+"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+   tc-export STRINGS
+
+   local

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

2023-02-14 Thread Michał Górny

commit: 692fbf11d2b279b59f2951cdc435f616902aadce
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Feb 14 15:57:34 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Feb 14 16:23:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692fbf11

games-engines/scummvm: Bump to 2.7.0

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-2.7.0.ebuild | 142 +
 2 files changed, 143 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 3660a6b7cce8..16aa3aefc916 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,3 +1,4 @@
 DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 
08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d
 SHA512 
5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03
 DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 
38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80
 SHA512 
6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69
 DIST scummvm-2.6.1.tar.xz 141354456 BLAKE2B 
b54001a53b3c899831745c94b1bf6020b462dfd49f6de35a609a6977846e7d036ee6c323c888c88379f4b6149dad31a1af5a38ae8d5231303dbba6a0ba97bb2f
 SHA512 
984e35683ec4fa6a0715a20027d471ff432a2da060caf1b28557e42ae7b2b5c3b32c3ef4f3c1fb0ac9bcde69d01f789b3054fe9b0ddb0fe9fadbee462c1afcc5
+DIST scummvm-2.7.0.tar.xz 145171776 BLAKE2B 
0f208919ca64cef56e513988635e02c84e5ce85cd328687bd566d17daee5a1386dd7986649655670117e3c211f10566b14f2a0b43bf3fe54ba68c542681b8a31
 SHA512 
099afbde36f73eec26059f63b541cf79dde7debf7068fb4fa4efd3ad09eecfccb57c92f0a21d120c56c6821e45133e0ca02e138beed98c16f2b273a965411271

diff --git a/games-engines/scummvm/scummvm-2.7.0.ebuild 
b/games-engines/scummvm/scummvm-2.7.0.ebuild
new file mode 100644
index ..4f5504d6ddf4
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.7.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+else
+   SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+   S=${WORKDIR}/${P/_/}
+fi
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+IUSE="
+   a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
+   mp3 +net opengl png sndio speech theora truetype unsupported vorbis
+   zlib
+"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+DEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac:= )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   fribidi? ( dev-libs/fribidi )
+   gif? ( media-libs/giflib )
+   gtk? (
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   net? (
+   media-libs/sdl2-net
+   net-misc/curl
+   )
+   opengl? (
+   || (
+   virtual/opengl
+   media-libs/mesa[gles2]
+   media-libs/mesa[gles1]
+   )
+   )
+   png? ( media-libs/libpng:0 )
+   sndio? ( media-sound/sndio:= )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+   ${DEPEND}
+"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+   tc-export STRINGS
+
+   local myconf=(
+   --backend=sdl
+   --host=${CHOST}
+

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

2022-10-18 Thread Michał Górny

commit: 99655f406218225c34906b8a0f5562511ab7bd43
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Oct 18 06:01:47 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Oct 18 06:36:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99655f40

games-engines/scummvm: Bump to 2.6.1

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest |  1 +
 .../{scummvm-.ebuild => scummvm-2.6.1.ebuild}  | 18 +++---
 games-engines/scummvm/scummvm-.ebuild  | 18 +++---
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index abe9f6272320..3660a6b7cce8 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1,3 @@
 DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 
08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d
 SHA512 
5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03
 DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 
38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80
 SHA512 
6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69
+DIST scummvm-2.6.1.tar.xz 141354456 BLAKE2B 
b54001a53b3c899831745c94b1bf6020b462dfd49f6de35a609a6977846e7d036ee6c323c888c88379f4b6149dad31a1af5a38ae8d5231303dbba6a0ba97bb2f
 SHA512 
984e35683ec4fa6a0715a20027d471ff432a2da060caf1b28557e42ae7b2b5c3b32c3ef4f3c1fb0ac9bcde69d01f789b3054fe9b0ddb0fe9fadbee462c1afcc5

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-2.6.1.ebuild
similarity index 91%
copy from games-engines/scummvm/scummvm-.ebuild
copy to games-engines/scummvm/scummvm-2.6.1.ebuild
index 4e32d433ef29..d678e3432dbb 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-2.6.1.ebuild
@@ -13,15 +13,19 @@ if [[ ${PV} == ** ]]; then
 else
SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-   S="${WORKDIR}/${PN}-${P}"
+   S=${WORKDIR}/${P/_/}
 fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2 mp3 
+net opengl png sndio speech theora truetype unsupported vorbis zlib"
+IUSE="
+   a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
+   mp3 +net opengl png sndio speech theora truetype unsupported vorbis
+   zlib
+"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
-RDEPEND="
+DEPEND="
>=media-libs/libsdl2-2.0.0[sound,joystick,video]
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
@@ -59,15 +63,15 @@ RDEPEND="
)
zlib? ( sys-libs/zlib:= )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="
+   ${DEPEND}
+"
 BDEPEND="
app-arch/xz-utils
truetype? ( virtual/pkgconfig )
x86? ( dev-lang/nasm )
 "
 
-S="${WORKDIR}/${P/_/}"
-
 src_prepare() {
default
 
@@ -121,7 +125,7 @@ src_configure() {
$(use_enable x86 nasm)
)
echo "configure ${myconf[@]}"
-   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
+   # not an autoconf script, so don't call econf
SDL_CONFIG="sdl2-config" \
./configure "${myconf[@]}" ${EXTRA_ECONF} || die
 }

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-.ebuild
index 4e32d433ef29..d678e3432dbb 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-.ebuild
@@ -13,15 +13,19 @@ if [[ ${PV} == ** ]]; then
 else
SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-   S="${WORKDIR}/${PN}-${P}"
+   S=${WORKDIR}/${P/_/}
 fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2 mp3 
+net opengl png sndio speech theora truetype unsupported vorbis zlib"
+IUSE="
+   a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2
+   mp3 +net opengl png sndio speech theora truetype unsupported vorbis
+   zlib
+"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
-RDEPEND="
+DEPEND="
>=media-libs/libsdl2-2.0.0[sound,joystick,video]
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
@@ -59,15 +63,15 @@ RDEPEND="
)
zlib? ( sys-libs/zlib:= )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="
+   ${DEPEND}
+"
 BDEPEND="
app-arch/xz-utils
truetype? ( virtual/pkgconfig )
x86? ( dev-lang/nasm )

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

2022-07-17 Thread Michał Górny

commit: bab7d7b2eb737aa939ffccd85ee0c03d87de643e
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jul 17 06:02:38 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 17 06:27:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab7d7b2

games-engines/scummvm: Bump to 2.6.0

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest  | 1 +
 games-engines/scummvm/{scummvm-.ebuild => scummvm-2.6.0.ebuild} | 4 ++--
 games-engines/scummvm/scummvm-.ebuild   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 5f495ff22480..4d59ebe6a9bd 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,3 +1,4 @@
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B 
b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b
 SHA512 
001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
 DIST scummvm-2.5.0.tar.xz 130095472 BLAKE2B 
a5153280999e321be5bf7b56411c163d5ba1d4fb142fc900e1c3cb709d357d199d3764a94af57ab7218ee201bdbe6288adf222add9ffc941324b84d0e6954fe8
 SHA512 
7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e55281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534
 DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 
08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d
 SHA512 
5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03
+DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 
38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80
 SHA512 
6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-2.6.0.ebuild
similarity index 97%
copy from games-engines/scummvm/scummvm-.ebuild
copy to games-engines/scummvm/scummvm-2.6.0.ebuild
index fb4d5b239514..820e36114b99 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="
dev-libs/glib:2
x11-libs/gtk+:3
)
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:= )
mp3? ( media-libs/libmad )
mpeg2? ( media-libs/libmpeg2 )
net? (

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-.ebuild
index fb4d5b239514..820e36114b99 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="
dev-libs/glib:2
x11-libs/gtk+:3
)
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:= )
mp3? ( media-libs/libmad )
mpeg2? ( media-libs/libmpeg2 )
net? (

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

2022-07-17 Thread Michał Górny

commit: eef60e8ead370b9be167a187719c83cb76ddcc42
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jul 17 06:27:30 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 17 06:27:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef60e8e

games-engines/scummvm: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest |   2 -
 .../files/scummvm-2.2.0-fluidsynth-2.2.patch   | 150 -
 .../scummvm-2.2.0-ultima_engine_lua_dep.patch  |  18 ---
 games-engines/scummvm/scummvm-2.2.0-r2.ebuild  | 139 ---
 games-engines/scummvm/scummvm-2.5.0.ebuild | 140 ---
 5 files changed, 449 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 4d59ebe6a9bd..abe9f6272320 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,4 +1,2 @@
-DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B 
b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b
 SHA512 
001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-DIST scummvm-2.5.0.tar.xz 130095472 BLAKE2B 
a5153280999e321be5bf7b56411c163d5ba1d4fb142fc900e1c3cb709d357d199d3764a94af57ab7218ee201bdbe6288adf222add9ffc941324b84d0e6954fe8
 SHA512 
7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e55281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534
 DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 
08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d
 SHA512 
5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03
 DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B 
38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80
 SHA512 
6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69

diff --git a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch 
b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
deleted file mode 100644
index 8bb94ec6ab6e..
--- a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index e0d7c4e3df..d8e82c24f5 100644
 a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -46,6 +46,14 @@
- #include "backends/platform/ios7/ios7_common.h"
- #endif
- 
-+// We assume here Fluidsynth minor will never be above 255 and
-+// that micro versions won't break API compatibility
-+#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR)
-+#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) | 
FLUIDSYNTH_VERSION_MINOR)
-+#else
-+#define FS_API_VERSION 0
-+#endif
-+
- class MidiDriver_FluidSynth : public MidiDriver_Emulated {
- private:
-   MidiChannel_MPU401 _midiChannels[16];
-@@ -75,7 +83,7 @@ public:
- 
-   void setEngineSoundFont(Common::SeekableReadStream *soundFontData) 
override;
-   bool acceptsSoundFontData() override {
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
-   return true;
- #else
-   return false;
-@@ -134,7 +142,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const 
char *val) {
- 
- // Soundfont memory loader callback functions.
- 
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- static void *SoundFontMemLoader_open(const char *filename) {
-   void *p;
-   if (filename[0] != '&') {
-@@ -144,11 +152,19 @@ static void *SoundFontMemLoader_open(const char 
*filename) {
-   return p;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void 
*handle) {
-+#else
- static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
-+#endif
-   return ((Common::SeekableReadStream *) handle)->read(buf, count) == 
(uint32)count ? FLUID_OK : FLUID_FAILED;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, 
int origin) {
-+#else
- static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
-+#endif
-   return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? 
FLUID_OK : FLUID_FAILED;
- }
- 
-@@ -157,7 +173,11 @@ static int SoundFontMemLoader_close(void *handle) {
-   return FLUID_OK;
- }
- 
-+#if FS_API_VERSION >= 0x0202
-+static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
-+#else
- static long SoundFontMemLoader_tell(void *handle) {
-+#endif
-

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

2021-12-31 Thread James Le Cuirot

commit: 7bc0d4abc1101d85a330b4436420f7a3ca573219
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Dec 31 13:12:32 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Dec 31 13:12:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc0d4ab

games-engines/scummvm: Restore USE flag description removed by mistake

Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index cc741edd69c6..3cd0b4790f5b 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -12,6 +12,7 @@
   
 compile with support for fluidsynth
 Support for right-to-left languages via 
dev-libs/fribidi
+enable support for OpenGL Extension Wrangler Library 
(media-libs/glew)
 enable mpeg2 codec for cutscenes
 enable cloud support via 
media-libs/sdl2-net
 Enable support for MIDI music using 
media-sound/sndio

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

2021-12-31 Thread James Le Cuirot

commit: 2bc5af376e6786dec0ff5584474ad3733226971d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Dec 31 13:04:26 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Dec 31 13:10:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bc5af37

games-engines/scummvm: GLEW has been dropped in favour of GLAD

GLAD is just a single header, so it is bundled. We don't have a
package for it.

Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm/metadata.xml| 1 -
 games-engines/scummvm/scummvm-.ebuild | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index 3cd0b4790f5b..cc741edd69c6 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -12,7 +12,6 @@
   
 compile with support for fluidsynth
 Support for right-to-left languages via 
dev-libs/fribidi
-enable support for OpenGL Extension Wrangler Library 
(media-libs/glew)
 enable mpeg2 codec for cutscenes
 enable cloud support via 
media-libs/sdl2-net
 Enable support for MIDI music using 
media-sound/sndio

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-.ebuild
index 9f70736f67ee..fb4d5b239514 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 
mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi gif +gtk jpeg lua mpeg2 mp3 
+net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -47,7 +47,6 @@ RDEPEND="
media-libs/mesa[gles2]
media-libs/mesa[gles1]
)
-   glew? ( media-libs/glew:0= )
)
png? ( media-libs/libpng:0 )
sndio? ( media-sound/sndio:= )
@@ -104,7 +103,6 @@ src_configure() {
$(usex fluidsynth '' --disable-fluidsynth)
$(use_enable fribidi)
$(use_enable gif)
-   $(use opengl && use_enable glew)
$(use_enable gtk)
$(use_enable jpeg)
$(use_enable lua)

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

2021-12-28 Thread Ionen Wolkens

commit: 5b226face9805d8165324feff66d08ee6d9897c7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 28 14:55:53 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 28 17:00:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b226fac

games-engines/scummvm-tools: drop 2.1.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-engines/scummvm-tools/Manifest   |  1 -
 .../scummvm-tools/scummvm-tools-2.1.0.ebuild   | 66 --
 2 files changed, 67 deletions(-)

diff --git a/games-engines/scummvm-tools/Manifest 
b/games-engines/scummvm-tools/Manifest
index 46d781ead79e..c42f54febae1 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,2 +1 @@
-DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B 
e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136
 SHA512 
40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15
 DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B 
bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e
 SHA512 
97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
deleted file mode 100644
index 9920a02a2c51..
--- a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-inherit wxwidgets
-
-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 ~ppc ~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}
-"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.8.0-binprefix.patch"
-)
-
-src_prepare() {
-   default
-
-   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 \
-   --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
-}

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

2021-12-25 Thread Michał Górny

commit: 8626e7b3105023ff058ed56707590b4c6bf191d5
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec 25 07:50:01 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec 25 08:09:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8626e7b3

games-engines/scummvm: Bump to 2.5.1

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-2.5.1.ebuild | 140 +
 2 files changed, 141 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index d2ec580a7610..5f495ff22480 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1,3 @@
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B 
b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b
 SHA512 
001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
 DIST scummvm-2.5.0.tar.xz 130095472 BLAKE2B 
a5153280999e321be5bf7b56411c163d5ba1d4fb142fc900e1c3cb709d357d199d3764a94af57ab7218ee201bdbe6288adf222add9ffc941324b84d0e6954fe8
 SHA512 
7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e55281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534
+DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B 
08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d
 SHA512 
5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03

diff --git a/games-engines/scummvm/scummvm-2.5.1.ebuild 
b/games-engines/scummvm/scummvm-2.5.1.ebuild
new file mode 100644
index ..9f70736f67ee
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.5.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+else
+   SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+   S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 
mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   fribidi? ( dev-libs/fribidi )
+   gif? ( media-libs/giflib )
+   gtk? (
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   )
+   jpeg? ( virtual/jpeg:0 )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   net? (
+   media-libs/sdl2-net
+   net-misc/curl
+   )
+   opengl? (
+   || (
+   virtual/opengl
+   media-libs/mesa[gles2]
+   media-libs/mesa[gles1]
+   )
+   glew? ( media-libs/glew:0= )
+   )
+   png? ( media-libs/libpng:0 )
+   sndio? ( media-sound/sndio:= )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+   tc-export STRINGS
+
+   local myconf=(
+   --backend=sdl
+   --host=${CHOST}
+   --enable-verbose-build
+   --prefix="${EPREFIX}/usr"
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   --opengl-mode=$(usex opengl auto none)
+   --with-sdl-prefix="${EPREFIX}/usr"
+   $(use_enable a52)
+

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

2021-11-22 Thread Michał Górny

commit: d40a8862de0bfb211fe8f5066471c5e7f4b5b376
Author: Alan Swanson  improbability  net>
AuthorDate: Mon Nov 22 12:25:38 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov 22 13:20:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40a8862

games-engines/scummvm: Bump to version 2.5.0

Signed-off-by: Alan Swanson  improbability.net>
Closes: https://github.com/gentoo/gentoo/pull/23035
Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest| 1 +
 .../scummvm/{scummvm-.ebuild => scummvm-2.5.0.ebuild} | 8 +---
 games-engines/scummvm/scummvm-.ebuild | 8 +---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 7dda4a664151..d2ec580a7610 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1 +1,2 @@
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B 
b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b
 SHA512 
001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
+DIST scummvm-2.5.0.tar.xz 130095472 BLAKE2B 
a5153280999e321be5bf7b56411c163d5ba1d4fb142fc900e1c3cb709d357d199d3764a94af57ab7218ee201bdbe6288adf222add9ffc941324b84d0e6954fe8
 SHA512 
7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e55281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-2.5.0.ebuild
similarity index 90%
copy from games-engines/scummvm/scummvm-.ebuild
copy to games-engines/scummvm/scummvm-2.5.0.ebuild
index cf7685a08e01..9f70736f67ee 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-2.5.0.ebuild
@@ -11,14 +11,14 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/scummvm/scummvm;
 else
-   SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+   SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${PN}-${P}"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 
+net opengl png sndio speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 
mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -29,6 +29,7 @@ RDEPEND="
flac? ( media-libs/flac )
fluidsynth? ( media-sound/fluidsynth:= )
fribidi? ( dev-libs/fribidi )
+   gif? ( media-libs/giflib )
gtk? (
dev-libs/glib:2
x11-libs/gtk+:3
@@ -102,6 +103,7 @@ src_configure() {
$(use_enable flac)
$(usex fluidsynth '' --disable-fluidsynth)
$(use_enable fribidi)
+   $(use_enable gif)
$(use opengl && use_enable glew)
$(use_enable gtk)
$(use_enable jpeg)

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-.ebuild
index cf7685a08e01..9f70736f67ee 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-.ebuild
@@ -11,14 +11,14 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/scummvm/scummvm;
 else
-   SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+   SRC_URI="https://downloads.scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${PN}-${P}"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 
+net opengl png sndio speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi gif glew +gtk jpeg lua mpeg2 
mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -29,6 +29,7 @@ RDEPEND="
flac? ( media-libs/flac )
fluidsynth? ( media-sound/fluidsynth:= )
fribidi? ( dev-libs/fribidi )
+   gif? ( media-libs/giflib )
gtk? (
dev-libs/glib:2
x11-libs/gtk+:3
@@ -102,6 +103,7 @@ src_configure() {
$(use_enable flac)
$(usex fluidsynth '' --disable-fluidsynth)
$(use_enable fribidi)
+

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

2021-09-25 Thread Marek Szuba

commit: e9a11c52d4621816abb3f97a341307c87483b9c4
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Sep 25 17:47:53 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Sep 25 18:39:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a11c52

games-engines/scummvm: keyword 2.2.0-r2 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 games-engines/scummvm/scummvm-2.2.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild 
b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
index 65afd2a5beb..22d247713df 100644
--- a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/scummvm/scummvm;
 else
SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${PN}-${P}"
 fi

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

2021-09-07 Thread Ionen Wolkens

commit: f1f54feb4f20e305945cbf832344929c0619aeb7
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Mon Sep  6 00:01:37 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep  8 00:03:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f54feb

games-engines/scummvm: fix build, deps, bump eapi

Closes: https://bugs.gentoo.org/744421
Closes: https://bugs.gentoo.org/801229
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../{scummvm-2.2.0-r1.ebuild => scummvm-2.2.0-r2.ebuild}  | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild 
b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
similarity index 94%
rename from games-engines/scummvm/scummvm-2.2.0-r1.ebuild
rename to games-engines/scummvm/scummvm-2.2.0-r2.ebuild
index b6022c564f3..afdf8a36bf7 100644
--- a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-r2.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
 inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
@@ -29,13 +29,17 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
mp3? ( media-libs/libmad )
mpeg2? ( media-libs/libmpeg2 )
-   net? ( media-libs/sdl2-net )
+   net? (
+   media-libs/sdl2-net
+   net-misc/curl
+   )
opengl? ( || (
virtual/opengl
media-libs/mesa[gles2]
media-libs/mesa[gles1]
) )
png? ( media-libs/libpng:0 )
+   sndio? ( media-sound/sndio:= )
speech? ( app-accessibility/speech-dispatcher )
truetype? ( media-libs/freetype:2 )
theora? ( media-libs/libtheora )
@@ -60,7 +64,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   xdg_src_prepare
+   default
 
# -g isn't needed for nasm here
sed -i \
@@ -75,6 +79,7 @@ src_prepare() {
 
 src_configure() {
use x86 && append-ldflags -Wl,-z,noexecstack
+   tc-export STRINGS
 
local myconf=(
--backend=sdl
@@ -97,6 +102,7 @@ src_configure() {
$(use_enable lua)
$(use_enable mp3 mad)
$(use_enable mpeg2)
+   $(use_enable net libcurl)
$(use_enable net sdlnet)
$(use_enable png)
$(use_enable sndio)
@@ -117,8 +123,7 @@ src_configure() {
 src_compile() {
emake \
AR="$(tc-getAR) cru" \
-   RANLIB="$(tc-getRANLIB)" \
-   STRINGS="$(tc-getSTRINGS)"
+   RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {

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

2021-09-07 Thread Ionen Wolkens

commit: 2433f7afd26cdce6843ab85af86650bfb5ff623d
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Tue Sep  7 19:11:33 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep  8 00:03:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2433f7af

games-engines/scummvm: sync live ebuild

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-engines/scummvm/scummvm-2.2.0-r2.ebuild | 13 +---
 games-engines/scummvm/scummvm-.ebuild | 30 +++
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild 
b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
index afdf8a36bf7..65afd2a5beb 100644
--- a/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
@@ -6,11 +6,18 @@ inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
 HOMEPAGE="https://www.scummvm.org/;
-SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+else
+   SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+   S="${WORKDIR}/${PN}-${P}"
+fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net 
opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
@@ -117,7 +124,7 @@ src_configure() {
echo "configure ${myconf[@]}"
# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
SDL_CONFIG="sdl2-config" \
-   ./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
+   ./configure "${myconf[@]}" ${EXTRA_ECONF} || die
 }
 
 src_compile() {

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-.ebuild
index f6a91ef83cd..cf7685a08e0 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-.ebuild
@@ -1,16 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit desktop flag-o-matic git-r3 toolchain-funcs xdg
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
 HOMEPAGE="https://www.scummvm.org/;
-EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+else
+   SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+   S="${WORKDIR}/${PN}-${P}"
+fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS=""
 IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 
+net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
@@ -20,7 +27,7 @@ RDEPEND="
aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
flac? ( media-libs/flac )
-   fluidsynth? ( media-sound/fluidsynth )
+   fluidsynth? ( media-sound/fluidsynth:= )
fribidi? ( dev-libs/fribidi )
gtk? (
dev-libs/glib:2
@@ -29,7 +36,10 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
mp3? ( media-libs/libmad )
mpeg2? ( media-libs/libmpeg2 )
-   net? ( media-libs/sdl2-net )
+   net? (
+   media-libs/sdl2-net
+   net-misc/curl
+   )
opengl? (
|| (
virtual/opengl
@@ -39,6 +49,7 @@ RDEPEND="
glew? ( media-libs/glew:0= )
)
png? ( media-libs/libpng:0 )
+   sndio? ( media-sound/sndio:= )
speech? ( app-accessibility/speech-dispatcher )
truetype? ( media-libs/freetype:2 )
theora? ( media-libs/libtheora )
@@ -58,7 +69,7 @@ BDEPEND="
 S="${WORKDIR}/${P/_/}"
 
 src_prepare() {
-   xdg_src_prepare
+   default
 
# -g isn't needed for nasm here
sed -i \
@@ -73,6 +84,7 @@ src_prepare() {
 
 src_configure() {
use x86 && append-ldflags -Wl,-z,noexecstack
+   tc-export STRINGS
 
local myconf=(
--backend=sdl
@@ -96,6 +108,7 @@ src_configure() {
$(use_enable lua)
$(use_enable mp3 mad)
$(use_enable mpeg2)
+   $(use_enable net libcurl)
$(use_enable net sdlnet)
$(use_enable png)
$(use_enable sndio)
@@ -116,8 +129,7 @@ src_configure() {
 src_compile() {

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

2021-09-07 Thread Ionen Wolkens

commit: f18190f1c6a974bb606e30c3b0d0f71dd041f391
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Tue Sep  7 20:49:32 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep  8 00:03:13 2021 +
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  asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/8
Signed-off-by: Ionen Wolkens  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 000..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
 }

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

2021-05-30 Thread James Le Cuirot

commit: cee98c7731e99aa2044f81c9429f8609485c6da0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 30 15:22:05 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 30 15:22:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee98c77

games-engines/scummvm: Add sndio USE flag, fixing automagic dependency

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm/metadata.xml| 1 +
 games-engines/scummvm/scummvm-2.2.0-r1.ebuild | 3 ++-
 games-engines/scummvm/scummvm-.ebuild | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index dd278d4911d..4b13f3aa2ad 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -15,6 +15,7 @@
 enable support for OpenGL Extension Wrangler Library 
(media-libs/glew)
 enable mpeg2 codec for cutscenes
 enable cloud support via 
media-libs/sdl2-net
+Enable support for MIDI music using 
media-sound/sndio
 enable text-to-speech support through 
app-accessibility/speech-dispatcher
 enable unsupported and/or broken game engines 
(you're on your own)
   

diff --git a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild 
b/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
index f4ab2f0515e..b6022c564f3 100644
--- a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net 
opengl png speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net 
opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -99,6 +99,7 @@ src_configure() {
$(use_enable mpeg2)
$(use_enable net sdlnet)
$(use_enable png)
+   $(use_enable sndio)
$(use_enable speech tts)
$(use_enable theora theoradec)
$(use_enable truetype freetype2)

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-.ebuild
index 22e410bbb25..f6a91ef83cd 100644
--- a/games-engines/scummvm/scummvm-.ebuild
+++ b/games-engines/scummvm/scummvm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/scummvm/scummvm;
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 KEYWORDS=""
-IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 
+net opengl png speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 
+net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -98,6 +98,7 @@ src_configure() {
$(use_enable mpeg2)
$(use_enable net sdlnet)
$(use_enable png)
+   $(use_enable sndio)
$(use_enable speech tts)
$(use_enable theora theoradec)
$(use_enable truetype freetype2)

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

2021-04-15 Thread Michał Górny

commit: 713092ca1835ce8bc9981013c996abc563132054
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Apr 15 19:56:08 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Apr 15 20:44:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713092ca

games-engines/scummvm: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/Manifest |   1 -
 .../scummvm/files/scummvm-2.1.0-fluidsynth.patch   |  39 
 games-engines/scummvm/scummvm-2.1.2.ebuild | 110 -
 3 files changed, 150 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index a422ef4d771..7dda4a66415 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1 @@
-DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 
0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2
 SHA512 
a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B 
b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b
 SHA512 
001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e

diff --git a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch 
b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
deleted file mode 100644
index 6b4760e16dd..000
--- a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
-From: D G Turner 
-Date: Tue, 17 Dec 2019 04:21:04 +
-Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
-
-The previous fix did not work as the forbidden exception had no effect
-since scummsys.h and thus forbidden.h had already been included prior
-to the fluidsynth header being included. This also meant that undefining
-the exception define after the header would have had no effect anyway.
-
-This new solution was suggest by eriktorbjorn on bug #11278 and should
-avoid the need to add an exception which would persist over the entire
-source file.

- audio/softsynth/fluidsynth.cpp | 15 +++
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index 33a74a15247..f8c2412492e 100644
 a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -20,10 +20,16 @@
-  *
-  */
- 
--#include "common/scummsys.h"
-+#include "config.h"
- 
- #ifdef USE_FLUIDSYNTH
- 
-+// Fluidsynth v2.1+ uses printf in one of it's headers,
-+// include/fluidsynth/log.h around line 82 so need to include this
-+// prior scummsys.h inclusion and thus forbidden.h
-+#include 
-+
-+#include "common/scummsys.h"
- #include "common/config-manager.h"
- #include "common/error.h"
- #include "common/system.h"

diff --git a/games-engines/scummvm/scummvm-2.1.2.ebuild 
b/games-engines/scummvm/scummvm-2.1.2.ebuild
deleted file mode 100644
index 5f7022f1055..000
--- a/games-engines/scummvm/scummvm-2.1.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="https://www.scummvm.org/;
-SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png 
speech theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND="
-   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
-   a52? ( media-libs/a52dec )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   flac? ( media-libs/flac )
-   fluidsynth? ( media-sound/fluidsynth )
-   jpeg? ( virtual/jpeg:0 )
-   mp3? ( media-libs/libmad )
-   mpeg2? ( media-libs/libmpeg2 )
-   net? ( media-libs/sdl2-net )
-   opengl? ( || ( virtual/opengl media-libs/mesa[gles2] 
media-libs/mesa[gles1] ) )
-   png? ( media-libs/libpng:0 )
-   speech? ( app-accessibility/speech-dispatcher )
-   truetype? ( media-libs/freetype:2 )
-   theora? ( media-libs/libtheora )
-   vorbis? (
-   media-libs/libogg
-   media-libs/libvorbis
-   )
-   zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   app-arch/xz-utils
-   truetype? ( virtual/pkgconfig )
-   x86? ( dev-lang/nasm )
-"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=(
-

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

2021-04-15 Thread Michał Górny

commit: 08f671f9dce9ac08533038bca37c4a8563560710
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Apr 15 19:57:47 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Apr 15 20:44:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f671f9

games-engines/scummvm: Backport fluidsynth-2.2 fix

Closes: https://bugs.gentoo.org/782805
Signed-off-by: Michał Górny  gentoo.org>

 .../files/scummvm-2.2.0-fluidsynth-2.2.patch   | 150 +
 ...cummvm-2.2.0.ebuild => scummvm-2.2.0-r1.ebuild} |   5 +-
 2 files changed, 153 insertions(+), 2 deletions(-)

diff --git a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch 
b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
new file mode 100644
index 000..8bb94ec6ab6
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
@@ -0,0 +1,150 @@
+diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
+index e0d7c4e3df..d8e82c24f5 100644
+--- a/audio/softsynth/fluidsynth.cpp
 b/audio/softsynth/fluidsynth.cpp
+@@ -46,6 +46,14 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+ 
++// We assume here Fluidsynth minor will never be above 255 and
++// that micro versions won't break API compatibility
++#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR)
++#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) | 
FLUIDSYNTH_VERSION_MINOR)
++#else
++#define FS_API_VERSION 0
++#endif
++
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+   MidiChannel_MPU401 _midiChannels[16];
+@@ -75,7 +83,7 @@ public:
+ 
+   void setEngineSoundFont(Common::SeekableReadStream *soundFontData) 
override;
+   bool acceptsSoundFontData() override {
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++#if FS_API_VERSION >= 0x0200
+   return true;
+ #else
+   return false;
+@@ -134,7 +142,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const 
char *val) {
+ 
+ // Soundfont memory loader callback functions.
+ 
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++#if FS_API_VERSION >= 0x0200
+ static void *SoundFontMemLoader_open(const char *filename) {
+   void *p;
+   if (filename[0] != '&') {
+@@ -144,11 +152,19 @@ static void *SoundFontMemLoader_open(const char 
*filename) {
+   return p;
+ }
+ 
++#if FS_API_VERSION >= 0x0202
++static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void 
*handle) {
++#else
+ static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
++#endif
+   return ((Common::SeekableReadStream *) handle)->read(buf, count) == 
(uint32)count ? FLUID_OK : FLUID_FAILED;
+ }
+ 
++#if FS_API_VERSION >= 0x0202
++static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, 
int origin) {
++#else
+ static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
++#endif
+   return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? 
FLUID_OK : FLUID_FAILED;
+ }
+ 
+@@ -157,7 +173,11 @@ static int SoundFontMemLoader_close(void *handle) {
+   return FLUID_OK;
+ }
+ 
++#if FS_API_VERSION >= 0x0202
++static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
++#else
+ static long SoundFontMemLoader_tell(void *handle) {
++#endif
+   return ((Common::SeekableReadStream *) handle)->pos();
+ }
+ #endif
+@@ -166,7 +186,8 @@ int MidiDriver_FluidSynth::open() {
+   if (_isOpen)
+   return MERR_ALREADY_OPEN;
+ 
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++
++#if FS_API_VERSION >= 0x0200
+   // When provided with in-memory SoundFont data, only use the configured
+   // SoundFont instead if it's explicitly configured on the current game.
+   bool isUsingInMemorySoundFontData = _engineSoundFontData && 
!ConfMan.getActiveDomain()->contains("soundfont");
+@@ -195,7 +216,11 @@ int MidiDriver_FluidSynth::open() {
+   _synth = new_fluid_synth(_settings);
+ 
+   if (ConfMan.getBool("fluidsynth_chorus_activate")) {
++#if FS_API_VERSION >= 0x0202
++  fluid_synth_chorus_on(_synth, -1, 1);
++#else
+   fluid_synth_set_chorus_on(_synth, 1);
++#endif
+ 
+   int chorusNr = ConfMan.getInt("fluidsynth_chorus_nr");
+   double chorusLevel = 
(double)ConfMan.getInt("fluidsynth_chorus_level") / 100.0;
+@@ -210,22 +235,49 @@ int MidiDriver_FluidSynth::open() {
+   chorusType = FLUID_CHORUS_MOD_TRIANGLE;
+   }
+ 
++#if FS_API_VERSION >= 0x0202
++  fluid_synth_set_chorus_group_nr(_synth, -1, chorusNr);
++  fluid_synth_set_chorus_group_level(_synth, -1, chorusLevel);
++  fluid_synth_set_chorus_group_speed(_synth, -1, chorusSpeed);
++  fluid_synth_set_chorus_group_depth(_synth, -1, chorusDepthMs);
++

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

2021-04-04 Thread Sam James

commit: 8650688df4df0dc9f3f3908b9ab72eb4887d66dc
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr  4 10:15:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  4 10:19:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8650688d

games-engines/scummvm-tools: eutils--, flag-o-matic--

Signed-off-by: Sam James  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild | 5 +++--
 games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
index 54cbb5e6684..9920a02a2c5 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 WX_GTK_VER=3.0-gtk3
-inherit wxwidgets eutils flag-o-matic
+inherit wxwidgets
 
 DESCRIPTION="utilities for the SCUMM game engine"
 HOMEPAGE="http://scummvm.sourceforge.net/;

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 8116e88b4f6..c514a09b8b7 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 WX_GTK_VER=3.0-gtk3
-inherit wxwidgets eutils flag-o-matic toolchain-funcs
+inherit wxwidgets toolchain-funcs
 
 DESCRIPTION="utilities for the SCUMM game engine"
 HOMEPAGE="http://scummvm.sourceforge.net/;

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

2020-12-03 Thread Michał Górny

commit: 7d6ea84dc5582de2ec8017516355f4341f739c0f
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Dec  3 23:32:31 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Dec  4 01:02:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d6ea84d

games-engines/scummvm: Add a live ebuild

Add a live version featuring the ResidualVM merge!

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/metadata.xml|   1 +
 games-engines/scummvm/scummvm-.ebuild | 125 ++
 2 files changed, 126 insertions(+)

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index 0254caa7401..922eaf0599b 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -8,6 +8,7 @@
   
 compile with support for fluidsynth
 Support for right-to-left languages via 
dev-libs/fribidi
+enable support for OpenGL Extension Wrangler Library 
(media-libs/glew)
 enable mpeg2 codec for cutscenes
 enable cloud support via 
media-libs/sdl2-net
 enable text-to-speech support through 
app-accessibility/speech-dispatcher

diff --git a/games-engines/scummvm/scummvm-.ebuild 
b/games-engines/scummvm/scummvm-.ebuild
new file mode 100644
index 000..22e410bbb25
--- /dev/null
+++ b/games-engines/scummvm/scummvm-.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic git-r3 toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+EGIT_REPO_URI="https://github.com/scummvm/scummvm;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS=""
+IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 
+net opengl png speech theora truetype unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac )
+   fluidsynth? ( media-sound/fluidsynth )
+   fribidi? ( dev-libs/fribidi )
+   gtk? (
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   )
+   jpeg? ( virtual/jpeg:0 )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   net? ( media-libs/sdl2-net )
+   opengl? (
+   || (
+   virtual/opengl
+   media-libs/mesa[gles2]
+   media-libs/mesa[gles1]
+   )
+   glew? ( media-libs/glew:0= )
+   )
+   png? ( media-libs/libpng:0 )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+   xdg_src_prepare
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+
+   local myconf=(
+   --backend=sdl
+   --host=${CHOST}
+   --enable-verbose-build
+   --prefix="${EPREFIX}/usr"
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   --opengl-mode=$(usex opengl auto none)
+   --with-sdl-prefix="${EPREFIX}/usr"
+   $(use_enable a52)
+   $(use_enable aac faad)
+   $(use_enable alsa)
+   $(use_enable debug)
+   $(use_enable !debug release-mode)
+   $(use_enable flac)
+   $(usex fluidsynth '' --disable-fluidsynth)
+   $(use_enable fribidi)
+   $(use opengl && use_enable glew)
+   $(use_enable gtk)
+   $(use_enable jpeg)
+   $(use_enable lua)
+   $(use_enable mp3 mad)
+   $(use_enable mpeg2)
+   $(use_enable net sdlnet)
+   $(use_enable png)
+   $(use_enable speech tts)
+   $(use_enable theora theoradec)
+   $(use_enable truetype freetype2)
+   $(usex unsupported --enable-all-engines '')
+   $(use_enable vorbis)
+   $(use_enable zlib)
+   $(use_enable x86 nasm)
+   )
+

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

2020-12-03 Thread Michał Górny

commit: 28ad0ed7f2d89d45bd957557f8ef0c262e4326d3
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Dec  3 23:32:54 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Dec  4 01:02:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ad0ed7

games-engines/scummvm: Add myself as a co-maintainer

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index 922eaf0599b..dd278d4911d 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -5,6 +5,10 @@
 ga...@gentoo.org
 Gentoo Games Project
   
+  
+mgo...@gentoo.org
+Michał Górny
+  
   
 compile with support for fluidsynth
 Support for right-to-left languages via 
dev-libs/fribidi

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

2020-09-24 Thread Lars Wendler

commit: 063ed5a1495c41350c0efe5464f86d7d010251b2
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Sep 24 06:09:29 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Sep 24 06:13:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063ed5a1

games-engines/scummvm: Replaced sed call with upstream patch

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 .../files/scummvm-2.2.0-ultima_engine_lua_dep.patch| 18 ++
 games-engines/scummvm/scummvm-2.2.0.ebuild |  9 -
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git 
a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch 
b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
new file mode 100644
index 000..d73ad03820e
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
@@ -0,0 +1,18 @@
+From d546389b10518eabd34fd5b4e22265069b25a966 Mon Sep 17 00:00:00 2001
+From: Paul Gilbert 
+Date: Wed, 23 Sep 2020 19:10:17 -0700
+Subject: [PATCH] ULTIMA: Add lua as an engine dependency
+
+---
+ engines/ultima/configure.engine | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
+index 6447e3eb7f96..704a79d1f61f 100644
+--- a/engines/ultima/configure.engine
 b/engines/ultima/configure.engine
+@@ -1,3 +1,3 @@
+ # This file is included from the main "configure" script
+ # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+-add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2"
++add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2 lua"

diff --git a/games-engines/scummvm/scummvm-2.2.0.ebuild 
b/games-engines/scummvm/scummvm-2.2.0.ebuild
index 2c3d39e3e7a..93e50eddec4 100644
--- a/games-engines/scummvm/scummvm-2.2.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0.ebuild
@@ -54,6 +54,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P/_/}"
 
+PATCHES=(
+   "${FILESDIR}/${P}-ultima_engine_lua_dep.patch"
+)
+
 src_prepare() {
xdg_src_prepare
 
@@ -66,11 +70,6 @@ src_prepare() {
-e '/INSTALL.*\/pixmaps/d' \
-e 's/-s //' \
ports.mk || die
-
-   # Without lua linking of ultima engine fails
-   # Please remove with next version bump!!!
-   sed '/^add_engine/s@"$@ lua"@' \
-   -i engines/ultima/configure.engine || die
 }
 
 src_configure() {

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

2020-09-23 Thread Lars Wendler

commit: 20f4af2f33d795d86bdc771a4e9748439bc622ac
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Sep 23 15:08:42 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Sep 23 15:09:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f4af2f

games-engines/scummvm-tools: Bump to version 2.2.0

- Fixed call to strings (bug #733416)

Closes: https://bugs.gentoo.org/733416
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-engines/scummvm-tools/Manifest   |  1 +
 .../scummvm-tools/scummvm-tools-2.2.0.ebuild   | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/games-engines/scummvm-tools/Manifest 
b/games-engines/scummvm-tools/Manifest
index 67d4024f9e6..46d781ead79 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1 +1,2 @@
 DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B 
e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136
 SHA512 
40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15
+DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B 
bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e
 SHA512 
97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
new file mode 100644
index 000..8116e88b4f6
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER=3.0-gtk3
+inherit wxwidgets eutils flag-o-matic toolchain-funcs
+
+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 ~ppc ~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}
+"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.8.0-binprefix.patch"
+)
+
+src_prepare() {
+   default
+
+   rm -rf *.bat dists/win32 || die
+   sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
+}
+
+src_configure() {
+   setup-wxwidgets
+
+   # Not an autoconf script
+   ./configure \
+   --disable-tremor \
+   --enable-verbose-build \
+   --mandir="${EPREFIX}/usr/share/man" \
+   --prefix="${EPREFIX}/usr" \
+   $(use_enable flac) \
+   $(use_enable iconv) \
+   $(use_enable iconv freetype2) \
+   $(use_enable mad) \
+   $(use_enable png) \
+   $(use_enable vorbis) || die
+}
+
+src_compile() {
+   emake STRINGS="$(tc-getSTRINGS)"
+}
+
+src_install() {
+   EXEPREFIX="${PN}-" default
+}

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

2020-09-23 Thread Lars Wendler

commit: e2b80866b0cb63563a0c0c4078e9eaa3d49ee10b
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Sep 23 14:26:20 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Sep 23 15:09:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b80866

games-engines/scummvm: Bump to version 2.2.0

- Added "gtk" USE flag (enabled by default) which provides the gtk file
  chooser for scummvm
- Enabled "net" USE flag by default
- Added "fribidi" USE flag
- Fixed call to strings (bug #733388)
- Fixed sdl2 detection with /usr merge (bug #699396)

Closes: https://bugs.gentoo.org/699396
Closes: https://bugs.gentoo.org/733390
Closes: https://bugs.gentoo.org/733388
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/metadata.xml |   1 +
 games-engines/scummvm/scummvm-2.2.0.ebuild | 126 +
 3 files changed, 128 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index ce4c90ad0a3..a422ef4d771 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1 +1,2 @@
 DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 
0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2
 SHA512 
a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc
+DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B 
b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b
 SHA512 
001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index 5ccc7bb685e..0254caa7401 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -7,6 +7,7 @@
   
   
 compile with support for fluidsynth
+Support for right-to-left languages via 
dev-libs/fribidi
 enable mpeg2 codec for cutscenes
 enable cloud support via 
media-libs/sdl2-net
 enable text-to-speech support through 
app-accessibility/speech-dispatcher

diff --git a/games-engines/scummvm/scummvm-2.2.0.ebuild 
b/games-engines/scummvm/scummvm-2.2.0.ebuild
new file mode 100644
index 000..2c3d39e3e7a
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.2.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net 
opengl png speech theora truetype unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac )
+   fluidsynth? ( media-sound/fluidsynth )
+   fribidi? ( dev-libs/fribidi )
+   gtk? (
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   )
+   jpeg? ( virtual/jpeg:0 )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   net? ( media-libs/sdl2-net )
+   opengl? ( || (
+   virtual/opengl
+   media-libs/mesa[gles2]
+   media-libs/mesa[gles1]
+   ) )
+   png? ( media-libs/libpng:0 )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+   xdg_src_prepare
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+
+   # Without lua linking of ultima engine fails
+   # Please remove with next version bump!!!
+   sed '/^add_engine/s@"$@ lua"@' \
+   -i engines/ultima/configure.engine || die
+}
+
+src_configure() {
+   use x86 && append-ldflags

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

2020-07-19 Thread James Le Cuirot

commit: 397539cf575103d062648e38d9f2bdb80e0bed46
Author: Henrik Pihl  gmail  com>
AuthorDate: Fri Jul 10 16:45:50 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 11:49:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397539cf

games-engines/scummvm: Bump to 2.1.2

TTS patch removed, already merged upstream.

Bug: https://bugs.gentoo.org/708600
Signed-off-by: Henrik Pihl  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16659
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-2.1.2.ebuild | 110 +
 2 files changed, 111 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 75b986c1944..dd160ccc1dd 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1 +1,2 @@
 DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B 
b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09
 SHA512 
9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218
+DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 
0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2
 SHA512 
a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc

diff --git a/games-engines/scummvm/scummvm-2.1.2.ebuild 
b/games-engines/scummvm/scummvm-2.1.2.ebuild
new file mode 100644
index 000..d0636f9429d
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.1.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png 
speech theora truetype unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac )
+   fluidsynth? ( media-sound/fluidsynth )
+   jpeg? ( virtual/jpeg:0 )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   net? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   png? ( media-libs/libpng:0 )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.1.0-fluidsynth.patch"
+)
+
+src_prepare() {
+   xdg_src_prepare
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+
+   local myconf=(
+   --backend=sdl
+   --host=${CHOST}
+   --enable-verbose-build
+   --prefix="${EPREFIX}/usr"
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   --opengl-mode=$(usex opengl auto none)
+   $(use_enable a52)
+   $(use_enable aac faad)
+   $(use_enable alsa)
+   $(use_enable debug)
+   $(use_enable !debug release-mode)
+   $(use_enable flac)
+   $(usex fluidsynth '' --disable-fluidsynth)
+   $(use_enable jpeg)
+   $(use_enable lua)
+   $(use_enable mp3 mad)
+   $(use_enable mpeg2)
+   $(use_enable net sdlnet)
+   $(use_enable png)
+   $(use_enable speech tts)
+   $(use_enable theora theoradec)
+   $(use_enable truetype freetype2)
+   $(usex unsupported --enable-all-engines '')
+   $(use_enable vorbis)
+   $(use_enable zlib)
+   $(use_enable x86 nasm)
+   )
+   echo "configure ${myconf[@]}"
+   # NOT AN AUTOCONF SCRIPT

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

2020-07-19 Thread James Le Cuirot

commit: 22595dccc4a9a3db38fdd6acc4055463cb375a7a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 19 11:34:07 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 11:49:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22595dcc

games-engines/scummvm-tools: EAPI 7

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: James Le Cuirot  gentoo.org>

 .../scummvm-tools/scummvm-tools-2.1.0.ebuild | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
index b0f58bbfe2a..54cbb5e6684 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 WX_GTK_VER=3.0-gtk3
 inherit wxwidgets eutils flag-o-matic
 
@@ -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"
+   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 \

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

2020-07-19 Thread James Le Cuirot

commit: b88d0de5681c2987e7f65cc5e5fa16b73187f02a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 19 11:48:25 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 11:49:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88d0de5

games-engines/scummvm: Allow dependency on GLES 1/2 instead of OpenGL

I'm slightly unsure about this but there seems little point in forcing
one API at build time when it can switch at runtime. It's not clear
whether GLES support is needed at build time to be able to use it at
runtime.

Closes: https://bugs.gentoo.org/731776
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm/scummvm-2.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm/scummvm-2.1.2.ebuild 
b/games-engines/scummvm/scummvm-2.1.2.ebuild
index 2eb60298d28..5f7022f1055 100644
--- a/games-engines/scummvm/scummvm-2.1.2.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
mp3? ( media-libs/libmad )
mpeg2? ( media-libs/libmpeg2 )
net? ( media-libs/sdl2-net )
-   opengl? ( virtual/opengl )
+   opengl? ( || ( virtual/opengl media-libs/mesa[gles2] 
media-libs/mesa[gles1] ) )
png? ( media-libs/libpng:0 )
speech? ( app-accessibility/speech-dispatcher )
truetype? ( media-libs/freetype:2 )

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

2020-07-19 Thread James Le Cuirot

commit: ecbd7828d35dc2906ea93e97d05d98042bf23470
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 19 11:30:46 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 11:49:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecbd7828

games-engines/scummvm-tools: Drop old 1.8.0-r1 and 2.0.0-r1

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm-tools/Manifest   |  2 -
 .../scummvm-tools/scummvm-tools-1.8.0-r1.ebuild| 58 -
 .../scummvm-tools/scummvm-tools-2.0.0-r1.ebuild| 59 --
 3 files changed, 119 deletions(-)

diff --git a/games-engines/scummvm-tools/Manifest 
b/games-engines/scummvm-tools/Manifest
index 3026acf91a0..67d4024f9e6 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,3 +1 @@
-DIST scummvm-tools-1.8.0.tar.xz 864048 BLAKE2B 
7e3184bda33c582708be204493cd99504ef7286305ba01d052a95bf317c56630109e963ecd8d26d4f8868bb75e5b0cb22154fe4cb794a01dabe25b11568babbb
 SHA512 
eed0aa0cceef59c42aabe94fe382a4494085c479d310cb624131746a1cbacc37d4a43603a5321167eb5fd4d9d8235fc794bdca5a3417fc4d224213e5409347ed
-DIST scummvm-tools-2.0.0.tar.xz 88 BLAKE2B 
51e6a771f0b1902f9cadc1e84da4b97aa42bc810c781ba238b3dad9ce242792d0de805e6d129607bace36b7a3cb8dc7a7a1a6fd13211320afe6546569b49f0ff
 SHA512 
a4c645f2a05b5f208658bad1a3122115a3077809141f5d4b281414ca32854d14987a8b6d4579f3bdd9d3eeeab880d98e3b540c3f69155197f20a2094a7812c60
 DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B 
e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136
 SHA512 
40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15

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 2a3b2686c5a..000
--- 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.0.0-r1.ebuild
deleted file mode 100644
index 4cf673ee91b..000
--- a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,59 +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 ~ppc ~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}/${PN}-1.8.0-binprefix.patch"
-)
-
-src_prepare() {
-   default
-
-

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

2020-07-19 Thread James Le Cuirot

commit: 83da3122371d8b77fd13e83836041a3c56fb34cb
Author: Henrik Pihl  gmail  com>
AuthorDate: Fri Jul 10 16:45:50 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 11:49:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83da3122

games-engines/scummvm-tools: Bump to 2.1.0

Migrate away from deprecated wxGTK slot.

Bug: https://bugs.gentoo.org/708600
Signed-off-by: Henrik Pihl  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16659
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm-tools/Manifest   |  1 +
 .../scummvm-tools/scummvm-tools-2.1.0.ebuild   | 59 ++
 2 files changed, 60 insertions(+)

diff --git a/games-engines/scummvm-tools/Manifest 
b/games-engines/scummvm-tools/Manifest
index 6656d34c748..3026acf91a0 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,2 +1,3 @@
 DIST scummvm-tools-1.8.0.tar.xz 864048 BLAKE2B 
7e3184bda33c582708be204493cd99504ef7286305ba01d052a95bf317c56630109e963ecd8d26d4f8868bb75e5b0cb22154fe4cb794a01dabe25b11568babbb
 SHA512 
eed0aa0cceef59c42aabe94fe382a4494085c479d310cb624131746a1cbacc37d4a43603a5321167eb5fd4d9d8235fc794bdca5a3417fc4d224213e5409347ed
 DIST scummvm-tools-2.0.0.tar.xz 88 BLAKE2B 
51e6a771f0b1902f9cadc1e84da4b97aa42bc810c781ba238b3dad9ce242792d0de805e6d129607bace36b7a3cb8dc7a7a1a6fd13211320afe6546569b49f0ff
 SHA512 
a4c645f2a05b5f208658bad1a3122115a3077809141f5d4b281414ca32854d14987a8b6d4579f3bdd9d3eeeab880d98e3b540c3f69155197f20a2094a7812c60
+DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B 
e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136
 SHA512 
40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
new file mode 100644
index 000..6c46f947a6d
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0-gtk3
+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 ~ppc ~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}/${PN}-1.8.0-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 \
+   --prefix=/usr \
+   --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
+}

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

2020-07-19 Thread James Le Cuirot

commit: 7255010bdf125cedb7733b55c10d588aed0a763b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar  8 22:05:58 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 11:49:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7255010b

games-engines/scummvm-tools: Add missing libpng SLOT operator

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
index 6c46f947a6d..b0f58bbfe2a 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/boost-1.32:=
flac? ( media-libs/flac )
iconv? ( virtual/libiconv media-libs/freetype:2 )
mad? ( media-libs/libmad )
-   png? ( media-libs/libpng:0 )
+   png? ( media-libs/libpng:0= )
vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}
app-arch/xz-utils

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

2020-07-19 Thread James Le Cuirot

commit: 0f43ed98a37ffddd26f18f1c6cbe53783148d9c8
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 19 11:11:51 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 11:49:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f43ed98

games-engines/scummvm: Drop old 2.1.0

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm/Manifest |   1 -
 .../files/scummvm-2.1.0-tts_pthread_link.patch |  22 
 games-engines/scummvm/scummvm-2.1.0.ebuild | 111 -
 3 files changed, 134 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index dd160ccc1dd..ce4c90ad0a3 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1 @@
-DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B 
b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09
 SHA512 
9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218
 DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 
0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2
 SHA512 
a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc

diff --git a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch 
b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
deleted file mode 100644
index 70440be0e13..000
--- a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 26c09be3a091e47419ba2629c5f2a346ad6a5543 Mon Sep 17 00:00:00 2001
-From: Christian Krause 
-Date: Wed, 16 Oct 2019 22:41:27 +0200
-Subject: [PATCH] TTS: Link libpthread explicitly on Linux platform
-

- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 0adf0bb7bad..dbfe336e6d0 100755
 a/configure
-+++ b/configure
-@@ -5504,7 +5504,7 @@ else
-   echo "linux"
-   _tts=yes
-   define_in_config_if_yes $_tts 'USE_SPEECH_DISPATCHER'
--  append_var LIBS '-lspeechd'
-+  append_var LIBS '-lspeechd -lpthread'
-   ;;
-   mingw*)
-   echo "win32"

diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild 
b/games-engines/scummvm/scummvm-2.1.0.ebuild
deleted file mode 100644
index 7aacd055d80..000
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="https://www.scummvm.org/;
-SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png 
speech theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND="
-   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
-   a52? ( media-libs/a52dec )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   flac? ( media-libs/flac )
-   fluidsynth? ( media-sound/fluidsynth )
-   jpeg? ( virtual/jpeg:0 )
-   mp3? ( media-libs/libmad )
-   mpeg2? ( media-libs/libmpeg2 )
-   net? ( media-libs/sdl2-net )
-   opengl? ( virtual/opengl )
-   png? ( media-libs/libpng:0 )
-   speech? ( app-accessibility/speech-dispatcher )
-   truetype? ( media-libs/freetype:2 )
-   theora? ( media-libs/libtheora )
-   vorbis? (
-   media-libs/libogg
-   media-libs/libvorbis
-   )
-   zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   app-arch/xz-utils
-   truetype? ( virtual/pkgconfig )
-   x86? ( dev-lang/nasm )
-"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-tts_pthread_link.patch"
-   "${FILESDIR}/${P}-fluidsynth.patch"
-)
-
-src_prepare() {
-   xdg_src_prepare
-
-   # -g isn't needed for nasm here
-   sed -i \
-   -e '/NASMFLAGS/ s/-g//' \
-   configure || die
-   sed -i \
-   -e '/INSTALL.*doc/d' \
-   -e '/INSTALL.*\/pixmaps/d' \
-   -e 's/-s //' \
-   ports.mk || die
-}
-
-src_configure() {
-   use x86 && append-ldflags -Wl,-z,noexecstack
-
-   local myconf=(
-   --backend=sdl
-   --host=${CHOST}
-   --enable-verbose-build
-

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

2020-07-19 Thread James Le Cuirot

commit: 6cb8c4970f0bc50e0e6c50790cb85828b8042423
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 19 11:11:01 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 11:49:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb8c497

games-engines/scummvm: Add ~arm64 keyword to 2.1.2

This ebuild was submitted before the keyword was added to 2.1.0.

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm/scummvm-2.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm/scummvm-2.1.2.ebuild 
b/games-engines/scummvm/scummvm-2.1.2.ebuild
index d0636f9429d..2eb60298d28 100644
--- a/games-engines/scummvm/scummvm-2.1.2.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png 
speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507

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

2020-07-18 Thread Sam James

commit: 185b2293828087ceae26b389e7cccf81c359d600
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 18 22:47:00 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 18 22:48:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185b2293

games-engines/scummvm: arm64 keyworded (bug #730648)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 games-engines/scummvm/scummvm-2.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild 
b/games-engines/scummvm/scummvm-2.1.0.ebuild
index 06cc2f964fe..7aacd055d80 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.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
@@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png 
speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507

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

2019-12-30 Thread James Le Cuirot

commit: 70c58a213ee7a2205cb7f6e7790063b97876ae60
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Dec 30 22:37:52 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Dec 30 22:38:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c58a21

games-engines/scummvm: Drop old 2.0.0

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/scummvm/Manifest |  1 -
 .../files/scummvm-2.0.0-freetype_pkgconfig.patch   | 99 --
 games-engines/scummvm/scummvm-2.0.0-r1.ebuild  | 98 -
 3 files changed, 198 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index eafca9329bc..75b986c1944 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1 @@
-DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 
303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948
 SHA512 
5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
 DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B 
b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09
 SHA512 
9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218

diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch 
b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index ca5c5e89271..000
--- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Sun, 6 May 2018 20:55:29 +0200
-Subject: [PATCH] Prefer pkg-config over freetype-config if possible
-
-As of freetype-2.9.1 the freetype-config script no longer gets installed
-by default.

- configure | 56 ---
- 1 file changed, 37 insertions(+), 19 deletions(-)
-
-diff --git a/configure b/configure
-index 8e2a387acc..210951e343 100755
 a/configure
-+++ b/configure
-@@ -204,6 +204,7 @@ _sparklepath=
- _sdlconfig=sdl2-config
- _libcurlconfig=curl-config
- _freetypeconfig=freetype-config
-+_freetype_found="false"
- _sdlpath="$PATH"
- _freetypepath="$PATH"
- _libcurlpath="$PATH"
-@@ -4668,28 +4669,45 @@ echo "$_libunity"
- #
- # Check for FreeType2 to be present
- #
--if test "$_freetype2" != "no"; then
--
--  # Look for the freetype-config script
--  find_freetypeconfig
--
--  if test -z "$_freetypeconfig"; then
--  _freetype2=no
-+find_freetype() {
-+# Wrapper function which tries to find freetype
-+# either by callimg freetype-config or by using
-+# pkg-config.
-+# As of freetype-2.9.1 the freetype-config file
-+# no longer gets installed by default.
-+
-+  if pkg-config --exists freetype2; then
-+  FREETYPE2_LIBS=`pkg-config --libs freetype2`
-+  FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+  FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2`
-+  _freetype_found="true"
-   else
--  # Since 2.3.12, freetype-config prepends $SYSROOT to everything.
--  # This means we can't pass it a --prefix that includes $SYSROOT.
--  freetypeprefix="$_freetypepath"
--  if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
--  teststring=VeryImplausibleSysrootX1Y2Z3
--  if ( env SYSROOT=/$teststring "$_freetypeconfig" 
--cflags | grep $teststring 2> /dev/null > /dev/null ); then
--  echo "Adapting FreeType prefix to SYSROOT" >> 
"$TMPLOG"
--  freetypeprefix="${freetypeprefix##$SYSROOT}"
-+  # Look for the freetype-config script
-+  find_freetypeconfig
-+  if test -n "$_freetypeconfig"; then
-+  # Since 2.3.12, freetype-config prepends $SYSROOT to 
everything.
-+  # This means we can't pass it a --prefix that includes 
$SYSROOT.
-+  freetypeprefix="$_freetypepath"
-+  if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
-+  teststring=VeryImplausibleSysrootX1Y2Z3
-+  if ( env SYSROOT=/$teststring 
"$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
-+  echo "Adapting FreeType prefix to 
SYSROOT" >> "$TMPLOG"
-+  
freetypeprefix="${freetypeprefix##$SYSROOT}"
-+  fi
-   fi
-+

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

2019-12-30 Thread James Le Cuirot

commit: d4b50daa7a356bbf112e37bd712d3d7b29d1c001
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Dec 30 22:37:09 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Dec 30 22:38:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b50daa

games-engines/scummvm: Upstream patch for fluidsynth-2.1.0

Closes: https://bugs.gentoo.org/704230
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 .../scummvm/files/scummvm-2.1.0-fluidsynth.patch   | 39 ++
 games-engines/scummvm/scummvm-2.1.0.ebuild |  1 +
 2 files changed, 40 insertions(+)

diff --git a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch 
b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
new file mode 100644
index 000..6b4760e16dd
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
@@ -0,0 +1,39 @@
+From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
+From: D G Turner 
+Date: Tue, 17 Dec 2019 04:21:04 +
+Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
+
+The previous fix did not work as the forbidden exception had no effect
+since scummsys.h and thus forbidden.h had already been included prior
+to the fluidsynth header being included. This also meant that undefining
+the exception define after the header would have had no effect anyway.
+
+This new solution was suggest by eriktorbjorn on bug #11278 and should
+avoid the need to add an exception which would persist over the entire
+source file.
+---
+ audio/softsynth/fluidsynth.cpp | 15 +++
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
+index 33a74a15247..f8c2412492e 100644
+--- a/audio/softsynth/fluidsynth.cpp
 b/audio/softsynth/fluidsynth.cpp
+@@ -20,10 +20,16 @@
+  *
+  */
+ 
+-#include "common/scummsys.h"
++#include "config.h"
+ 
+ #ifdef USE_FLUIDSYNTH
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers,
++// include/fluidsynth/log.h around line 82 so need to include this
++// prior scummsys.h inclusion and thus forbidden.h
++#include 
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"

diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild 
b/games-engines/scummvm/scummvm-2.1.0.ebuild
index 6b43908481d..06cc2f964fe 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/${P/_/}"
 
 PATCHES=(
"${FILESDIR}/${P}-tts_pthread_link.patch"
+   "${FILESDIR}/${P}-fluidsynth.patch"
 )
 
 src_prepare() {

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

2019-12-01 Thread Sergei Trofimovich

commit: 3aaafd47d03ba75719571978dea25be1b1c03718
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Dec  1 13:58:16 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Dec  1 13:58:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aaafd47

games-engines/scummvm: keyworded 2.1.0 for ppc64, bug #699360

Package-Manager: Portage-2.3.80, Repoman-2.3.19
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-engines/scummvm/scummvm-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild 
b/games-engines/scummvm/scummvm-2.1.0.ebuild
index 78fafff2ebc..6b43908481d 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png 
speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507

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

2019-12-01 Thread Sergei Trofimovich

commit: 922df3b9c5e19e966c9e36e5e4a4cd98cf088dfc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Dec  1 13:52:30 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Dec  1 13:52:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922df3b9

games-engines/scummvm: keyworded 2.1.0 for ppc, bug #699360

Package-Manager: Portage-2.3.80, Repoman-2.3.19
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-engines/scummvm/scummvm-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild 
b/games-engines/scummvm/scummvm-2.1.0.ebuild
index fa2a0700ccc..78fafff2ebc 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png 
speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507

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

2019-11-15 Thread Sven Wegener

commit: d7e37719dcfe4aa8e105282a5170482f2a15fd09
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri Nov 15 14:43:52 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Nov 15 14:45:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e37719

games-engines/scummvm-tools: Add sub-slot operator on boost

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Sven Wegener  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild | 4 ++--
 games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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
index 098f0922386..2a3b2686c5a 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~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 )

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
index b6a8e720aef..4cf673ee91b 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
@@ -15,7 +15,7 @@ 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 )

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

2019-11-05 Thread Lars Wendler

commit: 97be1a0e3c8281aff774a128fcd50ea9f8540670
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov  5 09:58:26 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov  5 09:58:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97be1a0e

games-engines/scummvm: Added "net" USE flag for optional cloud support

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 games-engines/scummvm/metadata.xml | 1 +
 games-engines/scummvm/scummvm-2.1.0.ebuild | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index e71c4a5e17b..5ccc7bb685e 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -8,6 +8,7 @@
   
 compile with support for fluidsynth
 enable mpeg2 codec for cutscenes
+enable cloud support via 
media-libs/sdl2-net
 enable text-to-speech support through 
app-accessibility/speech-dispatcher
 enable unsupported and/or broken game engines 
(you're on your own)
   

diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild 
b/games-engines/scummvm/scummvm-2.1.0.ebuild
index 4df7865efa7..fa2a0700ccc 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -11,12 +11,11 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 opengl png speech 
theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net opengl png 
speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
>=media-libs/libsdl2-2.0.0[sound,joystick,video]
-   media-libs/sdl2-net
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
@@ -25,6 +24,7 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
mp3? ( media-libs/libmad )
mpeg2? ( media-libs/libmpeg2 )
+   net? ( media-libs/sdl2-net )
opengl? ( virtual/opengl )
png? ( media-libs/libpng:0 )
speech? ( app-accessibility/speech-dispatcher )
@@ -84,6 +84,7 @@ src_configure() {
$(use_enable lua)
$(use_enable mp3 mad)
$(use_enable mpeg2)
+   $(use_enable net sdlnet)
$(use_enable png)
$(use_enable speech tts)
$(use_enable theora theoradec)

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

2019-11-05 Thread Lars Wendler

commit: 795ddb27af01ccd04cb22ec64cbacbf94a0c5edd
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov  5 08:52:06 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov  5 08:52:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=795ddb27

games-engines/scummvm: Removed ~ppc and ~ppc64 KEYWORDS

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 games-engines/scummvm/scummvm-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild 
b/games-engines/scummvm/scummvm-2.1.0.ebuild
index f278a9a5471..4df7865efa7 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 opengl png speech 
theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507

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

2019-11-04 Thread Lars Wendler

commit: f7daebb36ddf1612cea0cf0f1d6141c9bc01fb56
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov  5 07:05:29 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov  5 07:09:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7daebb3

games-engines/scummvm: Bump to version 2.1.0

Closes: https://bugs.gentoo.org/699334
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 games-engines/scummvm/Manifest |   1 +
 .../files/scummvm-2.1.0-tts_pthread_link.patch |  22 +
 games-engines/scummvm/metadata.xml |   1 +
 games-engines/scummvm/scummvm-2.1.0.ebuild | 109 +
 4 files changed, 133 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index e3b863b3406..eafca9329bc 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1 +1,2 @@
 DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 
303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948
 SHA512 
5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
+DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B 
b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09
 SHA512 
9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218

diff --git a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch 
b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
new file mode 100644
index 000..70440be0e13
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
@@ -0,0 +1,22 @@
+From 26c09be3a091e47419ba2629c5f2a346ad6a5543 Mon Sep 17 00:00:00 2001
+From: Christian Krause 
+Date: Wed, 16 Oct 2019 22:41:27 +0200
+Subject: [PATCH] TTS: Link libpthread explicitly on Linux platform
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 0adf0bb7bad..dbfe336e6d0 100755
+--- a/configure
 b/configure
+@@ -5504,7 +5504,7 @@ else
+   echo "linux"
+   _tts=yes
+   define_in_config_if_yes $_tts 'USE_SPEECH_DISPATCHER'
+-  append_var LIBS '-lspeechd'
++  append_var LIBS '-lspeechd -lpthread'
+   ;;
+   mingw*)
+   echo "win32"

diff --git a/games-engines/scummvm/metadata.xml 
b/games-engines/scummvm/metadata.xml
index 3f7ace82af0..e71c4a5e17b 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -8,6 +8,7 @@
   
 compile with support for fluidsynth
 enable mpeg2 codec for cutscenes
+enable text-to-speech support through 
app-accessibility/speech-dispatcher
 enable unsupported and/or broken game engines 
(you're on your own)
   
   

diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild 
b/games-engines/scummvm/scummvm-2.1.0.ebuild
new file mode 100644
index 000..f278a9a5471
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="https://www.scummvm.org/;
+SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 opengl png speech 
theora truetype unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND="
+   >=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   media-libs/sdl2-net
+   a52? ( media-libs/a52dec )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   flac? ( media-libs/flac )
+   fluidsynth? ( media-sound/fluidsynth )
+   jpeg? ( virtual/jpeg:0 )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   opengl? ( virtual/opengl )
+   png? ( media-libs/libpng:0 )
+   speech? ( app-accessibility/speech-dispatcher )
+   truetype? ( media-libs/freetype:2 )
+   theora? ( media-libs/libtheora )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-tts_pthread_link.patch"
+)
+
+src_prepare() {
+   xdg_src_prepare
+
+   # -g isn't needed for nasm here

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

2019-10-11 Thread Michał Górny

commit: d24456e69a3be61e10a5447dfb5d8acd54ceb3fc
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:35:23 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 11 15:35:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d24456e6

games-engines: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild | 2 +-
 games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild | 2 +-
 games-engines/scummvm/scummvm-2.0.0-r1.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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
index 114768f9f88..098f0922386 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files
 

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
index 9b47bf5b3ad..b6a8e720aef 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files
 

diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild 
b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
index 9867d2bb2ab..ec9d93fc808 100644
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507

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

2019-06-09 Thread Sergei Trofimovich

commit: 7ebb38953b82f52b065940af98f02213c0881ffc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun  9 19:21:01 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun  9 19:21:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ebb3895

games-engines/scummvm: keyworded 2.0.0-r1 for ppc, bug #687634

Package-Manager: Portage-2.3.67, Repoman-2.3.14
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-engines/scummvm/scummvm-2.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild 
b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
index 80cf8306ba4..9867d2bb2ab 100644
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507

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

2019-06-09 Thread Sergei Trofimovich

commit: edf00422f6b3e014847ba1544a05d04949f7ff93
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun  9 19:21:06 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun  9 19:21:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf00422

games-engines/scummvm-tools: keyworded 2.0.0-r1 for ppc, bug #687634

Package-Manager: Portage-2.3.67, Repoman-2.3.14
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
index 66e28b742a4..9b47bf5b3ad 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files

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

2019-04-13 Thread Pacho Ramos

commit: 9e4e55f3b5b74fbc4649547cf2f93187493184d5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Apr 13 22:25:47 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 13 22:44:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e4e55f3

games-engines/scummvm: Update HOMEPAGE, use https

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 games-engines/scummvm/scummvm-2.0.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild 
b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
index 100cda36687..80cf8306ba4 100644
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/;
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+HOMEPAGE="https://www.scummvm.org/;
+SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"

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

2019-04-13 Thread Pacho Ramos

commit: f69f7cfb76079761fe291dd3efb8baf541f1b35a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Apr 13 22:23:43 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 13 22:44:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69f7cfb

games-engines/scummvm: Drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 games-engines/scummvm/scummvm-2.0.0.ebuild | 106 -
 1 file changed, 106 deletions(-)

diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild 
b/games-engines/scummvm/scummvm-2.0.0.ebuild
deleted file mode 100644
index b4df47b76af..000
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/;
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
-   zlib? ( sys-libs/zlib )
-   jpeg? ( virtual/jpeg:0 )
-   png? ( media-libs/libpng:0 )
-   vorbis? ( media-libs/libogg media-libs/libvorbis )
-   theora? ( media-libs/libtheora )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   mp3? ( media-libs/libmad )
-   mpeg2? ( media-libs/libmpeg2 )
-   flac? ( media-libs/flac )
-   opengl? ( virtual/opengl )
-   truetype? ( media-libs/freetype:2 )
-   fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   truetype? ( virtual/pkgconfig )
-   x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
-
-src_prepare() {
-   default
-
-   # -g isn't needed for nasm here
-   sed -i \
-   -e '/NASMFLAGS/ s/-g//' \
-   configure || die
-   sed -i \
-   -e '/INSTALL.*doc/d' \
-   -e '/INSTALL.*\/pixmaps/d' \
-   -e 's/-s //' \
-   ports.mk || die
-}
-
-src_configure() {
-   use x86 && append-ldflags -Wl,-z,noexecstack
-
-   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-   SDL_CONFIG="sdl2-config" \
-   ./configure \
-   --backend=sdl \
-   --host=${CHOST} \
-   --enable-verbose-build \
-   --prefix=/usr \
-   --libdir="/usr/$(get_libdir)" \
-   --opengl-mode=$(usex opengl auto none) \
-   $(use_enable aac faad) \
-   $(use_enable alsa) \
-   $(use_enable debug) \
-   $(use_enable !debug release-mode) \
-   $(use_enable flac) \
-   $(usex fluidsynth '' --disable-fluidsynth) \
-   $(use_enable jpeg) \
-   $(use_enable mp3 mad) \
-   $(use_enable mpeg2) \
-   $(use_enable png) \
-   $(use_enable theora theoradec) \
-   $(use_enable truetype freetype2) \
-   $(usex unsupported --enable-all-engines '') \
-   $(use_enable vorbis) \
-   $(use_enable zlib) \
-   $(use_enable x86 nasm) \
-   ${myconf} ${EXTRA_ECONF} || die
-}
-
-src_compile() {
-   emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-   default
-   doicon -s scalable icons/scummvm.svg
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
-}

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

2019-04-13 Thread Pacho Ramos

commit: 6f865a38c3e7026f01a7a3f1d896adf085cffa6c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Apr 13 22:24:52 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 13 22:44:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f865a38

games-engines/scummvm: Fix xdg.eclass usage

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 games-engines/scummvm/scummvm-2.0.0-r1.ebuild | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild 
b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
index 858b3bcc36b..100cda36687 100644
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}/${P/_/}"
 PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
 
 src_prepare() {
-   default
+   xdg_src_prepare
 
# -g isn't needed for nasm here
sed -i \
@@ -96,15 +96,3 @@ src_install() {
default
doicon -s scalable icons/scummvm.svg
 }
-
-pkg_preinst() {
-   xdg_pkg_preinst
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-}
-
-pkg_postrm() {
-   xdg_pkg_postrm
-}

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

2019-03-15 Thread Lars Wendler

commit: 661cc3f91161da2a0771b9b8a5091615949d82ed
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 15 22:13:00 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 15 22:45:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661cc3f9

games-engines/scummvm: Removed old.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 games-engines/scummvm/Manifest |   1 -
 games-engines/scummvm/scummvm-1.9.0.ebuild | 102 -
 2 files changed, 103 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index a14c9fdd47f..e3b863b3406 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1 @@
-DIST scummvm-1.9.0.tar.xz 22020384 BLAKE2B 
10f2c20cf1e32a60897c9e909e0bfda7827a646eb38aaf4923b76708fb5b797c66f94d92f7c095ca77570712223cd0d037fccc563c709448d4d2093299050773
 SHA512 
c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
 DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 
303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948
 SHA512 
5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c

diff --git a/games-engines/scummvm/scummvm-1.9.0.ebuild 
b/games-engines/scummvm/scummvm-1.9.0.ebuild
deleted file mode 100644
index 5e45b629955..000
--- a/games-engines/scummvm/scummvm-1.9.0.ebuild
+++ /dev/null
@@ -1,102 +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 gnome2-utils toolchain-funcs
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/;
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
-   zlib? ( sys-libs/zlib )
-   jpeg? ( virtual/jpeg:0 )
-   png? ( media-libs/libpng:0 )
-   vorbis? ( media-libs/libogg media-libs/libvorbis )
-   theora? ( media-libs/libtheora )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   mp3? ( media-libs/libmad )
-   mpeg2? ( media-libs/libmpeg2 )
-   flac? ( media-libs/flac )
-   opengl? ( virtual/opengl )
-   truetype? ( media-libs/freetype:2 )
-   fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-   default
-
-   # -g isn't needed for nasm here
-   sed -i \
-   -e '/NASMFLAGS/ s/-g//' \
-   configure || die
-   sed -i \
-   -e '/INSTALL.*doc/d' \
-   -e '/INSTALL.*\/pixmaps/d' \
-   -e 's/-s //' \
-   ports.mk || die
-}
-
-src_configure() {
-   use x86 && append-ldflags -Wl,-z,noexecstack
-
-   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-   SDL_CONFIG="sdl2-config" \
-   ./configure \
-   --backend=sdl \
-   --host=${CHOST} \
-   --enable-verbose-build \
-   --prefix=/usr \
-   --libdir="/usr/$(get_libdir)" \
-   --opengl-mode=$(usex opengl auto none) \
-   $(use_enable aac faad) \
-   $(use_enable alsa) \
-   $(use_enable debug) \
-   $(use_enable !debug release-mode) \
-   $(use_enable flac) \
-   $(usex fluidsynth '' --disable-fluidsynth) \
-   $(use_enable jpeg) \
-   $(use_enable mp3 mad) \
-   $(use_enable mpeg2) \
-   $(use_enable png) \
-   $(use_enable theora theoradec) \
-   $(use_enable truetype freetype2) \
-   $(usex unsupported --enable-all-engines '') \
-   $(use_enable vorbis) \
-   $(use_enable zlib) \
-   $(use_enable x86 nasm) \
-   ${myconf} ${EXTRA_ECONF} || die
-}
-
-src_compile() {
-   emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-   default
-   doicon -s scalable icons/scummvm.svg
-   make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}

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

2019-03-15 Thread Lars Wendler

commit: f5af80ab565c07d5da0443dd2b2d137e54d9a3c8
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 15 22:12:32 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 15 22:45:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5af80ab

games-engines/scummvm: EAPI-7 revbump.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 games-engines/scummvm/scummvm-2.0.0-r1.ebuild | 110 ++
 1 file changed, 110 insertions(+)

diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild 
b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
new file mode 100644
index 000..858b3bcc36b
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="http://scummvm.sourceforge.net/;
+SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   zlib? ( sys-libs/zlib:= )
+   jpeg? ( virtual/jpeg:0 )
+   png? ( media-libs/libpng:0 )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   theora? ( media-libs/libtheora )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   flac? ( media-libs/flac )
+   opengl? ( virtual/opengl )
+   truetype? ( media-libs/freetype:2 )
+   fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-arch/xz-utils
+   truetype? ( virtual/pkgconfig )
+   x86? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+
+   local myconf=(
+   --backend=sdl
+   --host=${CHOST}
+   --enable-verbose-build
+   --prefix="${EPREFIX}/usr"
+   --libdir="${EPREFIX}/usr/$(get_libdir)"
+   --opengl-mode=$(usex opengl auto none)
+   $(use_enable aac faad)
+   $(use_enable alsa)
+   $(use_enable debug)
+   $(use_enable !debug release-mode)
+   $(use_enable flac)
+   $(usex fluidsynth '' --disable-fluidsynth)
+   $(use_enable jpeg)
+   $(use_enable mp3 mad)
+   $(use_enable mpeg2)
+   $(use_enable png)
+   $(use_enable theora theoradec)
+   $(use_enable truetype freetype2)
+   $(usex unsupported --enable-all-engines '')
+   $(use_enable vorbis)
+   $(use_enable zlib)
+   $(use_enable x86 nasm)
+   )
+   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
+   SDL_CONFIG="sdl2-config" \
+   ./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
+}
+
+src_compile() {
+   emake AR="$(tc-getAR) cru" RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+   default
+   doicon -s scalable icons/scummvm.svg
+}
+
+pkg_preinst() {
+   xdg_pkg_preinst
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+}

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

2018-05-07 Thread Lars Wendler

commit: de097e37dfa73706c033420fc8bdd147d2975788
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  7 07:03:03 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  7 07:03:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de097e37

games-engines/scummvm: Added improved freetype_pkgconfig patch

which should be ready for upstream inclusion.

Bug: https://bugs.gentoo.org/655032
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 .../files/scummvm-2.0.0-freetype_pkgconfig.patch   | 117 +++--
 games-engines/scummvm/scummvm-2.0.0.ebuild |   1 +
 2 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch 
b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
index 669cffc945c..ca5c5e89271 100644
--- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
+++ b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
@@ -1,50 +1,99 @@
-From 86c7fd67e5ab2e721de8493d162d7605b1b08823 Mon Sep 17 00:00:00 2001
+From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001
 From: Lars Wendler 
-Date: Sun, 6 May 2018 10:22:48 +0200
-Subject: [PATCH] Use pkg-config to find freetype if freetype-config is not
- available
+Date: Sun, 6 May 2018 20:55:29 +0200
+Subject: [PATCH] Prefer pkg-config over freetype-config if possible
 
+As of freetype-2.9.1 the freetype-config script no longer gets installed
+by default.
 ---
- configure | 17 +++--
- 1 file changed, 11 insertions(+), 6 deletions(-)
+ configure | 56 ---
+ 1 file changed, 37 insertions(+), 19 deletions(-)
 
 diff --git a/configure b/configure
-index 8e2a387acc..e3c15a9a2a 100755
+index 8e2a387acc..210951e343 100755
 --- a/configure
 +++ b/configure
-@@ -4674,7 +4674,13 @@ if test "$_freetype2" != "no"; then
-   find_freetypeconfig
- 
-   if test -z "$_freetypeconfig"; then
+@@ -204,6 +204,7 @@ _sparklepath=
+ _sdlconfig=sdl2-config
+ _libcurlconfig=curl-config
+ _freetypeconfig=freetype-config
++_freetype_found="false"
+ _sdlpath="$PATH"
+ _freetypepath="$PATH"
+ _libcurlpath="$PATH"
+@@ -4668,28 +4669,45 @@ echo "$_libunity"
+ #
+ # Check for FreeType2 to be present
+ #
+-if test "$_freetype2" != "no"; then
+-
+-  # Look for the freetype-config script
+-  find_freetypeconfig
+-
+-  if test -z "$_freetypeconfig"; then
 -  _freetype2=no
-+  if pkg-config --exists freetype2; then
-+  FREETYPE2_LIBS=`pkg-config --libs freetype2`
-+  FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+  _freetype2=yes
-+  else
-+  _freetype2=no
-+  fi
++find_freetype() {
++# Wrapper function which tries to find freetype
++# either by callimg freetype-config or by using
++# pkg-config.
++# As of freetype-2.9.1 the freetype-config file
++# no longer gets installed by default.
++
++  if pkg-config --exists freetype2; then
++  FREETYPE2_LIBS=`pkg-config --libs freetype2`
++  FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
++  FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2`
++  _freetype_found="true"
else
-   # Since 2.3.12, freetype-config prepends $SYSROOT to everything.
-   # This means we can't pass it a --prefix that includes $SYSROOT.
-@@ -4714,13 +4720,12 @@ EOF
+-  # Since 2.3.12, freetype-config prepends $SYSROOT to everything.
+-  # This means we can't pass it a --prefix that includes $SYSROOT.
+-  freetypeprefix="$_freetypepath"
+-  if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
+-  teststring=VeryImplausibleSysrootX1Y2Z3
+-  if ( env SYSROOT=/$teststring "$_freetypeconfig" 
--cflags | grep $teststring 2> /dev/null > /dev/null ); then
+-  echo "Adapting FreeType prefix to SYSROOT" >> 
"$TMPLOG"
+-  freetypeprefix="${freetypeprefix##$SYSROOT}"
++  # Look for the freetype-config script
++  find_freetypeconfig
++  if test -n "$_freetypeconfig"; then
++  # Since 2.3.12, freetype-config prepends $SYSROOT to 
everything.
++  # This means we can't pass it a --prefix that includes 
$SYSROOT.
++  freetypeprefix="$_freetypepath"
++  if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
++  teststring=VeryImplausibleSysrootX1Y2Z3
++  if ( env SYSROOT=/$teststring 
"$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
++  echo "Adapting FreeType prefix to

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

2018-05-06 Thread Lars Wendler

commit: fdf3034423cf76c8a4ee2fc1abfc30aa539bd3dc
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun May  6 08:29:21 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun May  6 08:29:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf30344

games-engines/scummvm: Added experimental freetype_pkgconfig patch

Bug: https://bugs.gentoo.org/655032
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 .../files/scummvm-2.0.0-freetype_pkgconfig.patch   | 50 ++
 games-engines/scummvm/scummvm-2.0.0.ebuild |  6 ++-
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch 
b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
new file mode 100644
index 000..669cffc945c
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
@@ -0,0 +1,50 @@
+From 86c7fd67e5ab2e721de8493d162d7605b1b08823 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Sun, 6 May 2018 10:22:48 +0200
+Subject: [PATCH] Use pkg-config to find freetype if freetype-config is not
+ available
+
+---
+ configure | 17 +++--
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 8e2a387acc..e3c15a9a2a 100755
+--- a/configure
 b/configure
+@@ -4674,7 +4674,13 @@ if test "$_freetype2" != "no"; then
+   find_freetypeconfig
+ 
+   if test -z "$_freetypeconfig"; then
+-  _freetype2=no
++  if pkg-config --exists freetype2; then
++  FREETYPE2_LIBS=`pkg-config --libs freetype2`
++  FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
++  _freetype2=yes
++  else
++  _freetype2=no
++  fi
+   else
+   # Since 2.3.12, freetype-config prepends $SYSROOT to everything.
+   # This means we can't pass it a --prefix that includes $SYSROOT.
+@@ -4714,13 +4720,12 @@ EOF
+   fi
+   cc_check_clean
+   fi
+-
+-  if test "$_freetype2" = "yes"; then
+-  append_var LIBS "$FREETYPE2_LIBS"
+-  append_var INCLUDES "$FREETYPE2_CFLAGS"
+-  fi
+   fi
+ 
++  if test "$_freetype2" = "yes"; then
++  append_var LIBS "$FREETYPE2_LIBS"
++  append_var INCLUDES "$FREETYPE2_CFLAGS"
++  fi
+ fi
+ 
+ echocheck "FreeType2"
+-- 
+2.17.0
+

diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild 
b/games-engines/scummvm/scummvm-2.0.0.ebuild
index 4f775bc1705..0df104f23aa 100644
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
app-arch/xz-utils
x86? ( dev-lang/nasm )"
 
-S=${WORKDIR}/${P/_/}
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
 
 src_prepare() {
default

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

2018-01-15 Thread Sven Wegener

commit: 030d151e562fa9a5580a06249c87cb40261cdbfb
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Jan 15 23:28:15 2018 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Jan 15 23:29:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030d151e

games-engines/scummvm-tools: do not install into /usr/local

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../{scummvm-tools-2.0.0.ebuild => scummvm-tools-2.0.0-r1.ebuild}  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
similarity index 95%
rename from games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild
rename to games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
index c673ff3f6e8..66e28b742a4 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,6 +42,7 @@ src_prepare() {
 src_configure() {
# Not an autoconf script
./configure \
+   --prefix=/usr \
--disable-tremor \
--enable-verbose-build \
--mandir=/usr/share/man \

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

2017-12-18 Thread Lars Wendler

commit: e86e1c1bce60a0228d5ee68870298f6657b5ef48
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Dec 18 17:47:26 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Dec 18 17:48:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86e1c1b

games-engines/scummvm-tools: Bump to version 2.0.0

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-engines/scummvm-tools/Manifest   |  1 +
 .../scummvm-tools/scummvm-tools-2.0.0.ebuild   | 58 ++
 2 files changed, 59 insertions(+)

diff --git a/games-engines/scummvm-tools/Manifest 
b/games-engines/scummvm-tools/Manifest
index 3b142513da3..6656d34c748 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1 +1,2 @@
 DIST scummvm-tools-1.8.0.tar.xz 864048 BLAKE2B 
7e3184bda33c582708be204493cd99504ef7286305ba01d052a95bf317c56630109e963ecd8d26d4f8868bb75e5b0cb22154fe4cb794a01dabe25b11568babbb
 SHA512 
eed0aa0cceef59c42aabe94fe382a4494085c479d310cb624131746a1cbacc37d4a43603a5321167eb5fd4d9d8235fc794bdca5a3417fc4d224213e5409347ed
+DIST scummvm-tools-2.0.0.tar.xz 88 BLAKE2B 
51e6a771f0b1902f9cadc1e84da4b97aa42bc810c781ba238b3dad9ce242792d0de805e6d129607bace36b7a3cb8dc7a7a1a6fd13211320afe6546569b49f0ff
 SHA512 
a4c645f2a05b5f208658bad1a3122115a3077809141f5d4b281414ca32854d14987a8b6d4579f3bdd9d3eeeab880d98e3b540c3f69155197f20a2094a7812c60

diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild
new file mode 100644
index 000..c673ff3f6e8
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 ~x86-fbsd"
+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}/${PN}-1.8.0-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
+}

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

2017-12-18 Thread Lars Wendler

commit: 9bab5491fd1a06c85cb1d6360668da4c8e854764
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Dec 18 17:42:23 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Dec 18 17:48:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bab5491

games-engines/scummvm: Bump to version 2.0.0

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-2.0.0.ebuild | 103 +
 2 files changed, 104 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 8ca008d5cdd..c19aaec35bd 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,3 +1,4 @@
 DIST scummvm-1.8.0.tar.xz 17385064 BLAKE2B 
02298f525f38d07f89ed829585498ca3cf807b6f1aa9f7601e5f1759a3d908cd99cd19c3a21169b7df9db52eb5b38e2b56d4eac6bdca3ba01c972e5a5054827b
 SHA512 
2fb25467854d6115cf09fd40536728e2c1943c16d8bcb29ebbc3c37fa5dc750a72258e0b0dac6244e5ddcc5f2dfc69af3d7fdff83c98a92a546f8669daa8da27
 DIST scummvm-1.8.1.tar.xz 17807468 BLAKE2B 
c5ba8c54b96467d4362b7a41afafd5686ae817b619a2bcbc5c82f10fbc0f89af78720ec187503dd3e4ed2577932cf31f84c666cdabbddf579c0f79bfeb1a
 SHA512 
e67ee332668b14432dcd675051384bd4fee2c1a0ddf44f6f8aeaf889d5027a834187e2632d18959583fa258cf03f259a54fd2d88120fa62ef7496232b4e6bdb4
 DIST scummvm-1.9.0.tar.xz 22020384 BLAKE2B 
10f2c20cf1e32a60897c9e909e0bfda7827a646eb38aaf4923b76708fb5b797c66f94d92f7c095ca77570712223cd0d037fccc563c709448d4d2093299050773
 SHA512 
c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
+DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 
303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948
 SHA512 
5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c

diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild 
b/games-engines/scummvm/scummvm-2.0.0.ebuild
new file mode 100644
index 000..4f775bc1705
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.0.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="http://scummvm.sourceforge.net/;
+SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   zlib? ( sys-libs/zlib )
+   jpeg? ( virtual/jpeg:0 )
+   png? ( media-libs/libpng:0 )
+   vorbis? ( media-libs/libogg media-libs/libvorbis )
+   theora? ( media-libs/libtheora )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   flac? ( media-libs/flac )
+   opengl? ( virtual/opengl )
+   truetype? ( media-libs/freetype:2 )
+   fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+
+   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
+   SDL_CONFIG="sdl2-config" \
+   ./configure \
+   --backend=sdl \
+   --host=${CHOST} \
+   --enable-verbose-build \
+   --prefix=/usr \
+   --libdir="/usr/$(get_libdir)" \
+   --opengl-mode=$(usex opengl auto none) \
+   $(use_enable aac faad) \
+   $(use_enable alsa) \
+   $(use_enable debug) \
+   $(use_enable !debug release-mode) \
+   $(use_enable flac) \
+   $(usex fluidsynth '' --disable-fluidsynth) \
+   $(use_enable jpeg) \
+   $(use_enable mp3 mad) \
+   $(use_enable mpeg2) \
+   $(use_enable png) \
+   $(use_enable theora theoradec) \
+   $(use_enable truetype freetype2) \
+   $(usex unsupported --enable-all-engines '') \
+   $(use_enable vorbis) \
+   $(use_enable zlib) \

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

2017-12-18 Thread Lars Wendler

commit: c9c504491e39a8386e45a318bea88baa5af83834
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Dec 18 17:48:02 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Dec 18 17:48:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c50449

games-engines/scummvm-tools: Removed old.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../scummvm-tools/scummvm-tools-1.8.0.ebuild   | 57 --
 1 file changed, 57 deletions(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
deleted file mode 100644
index 3ce3b2b1924..000
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~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}
-   app-arch/xz-utils
-   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() {
-   EXEPREFIX="${PN}-" default
-   prepgamesdirs
-}

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

2017-12-18 Thread Lars Wendler

commit: 679b6a053c8e2c8333a91d2013cf56bedea83bb7
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Dec 18 17:42:59 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Dec 18 17:48:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679b6a05

games-engines/scummvm: Removed old.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-engines/scummvm/Manifest|   2 -
 games-engines/scummvm/scummvm-1.8.0.ebuild| 109 --
 games-engines/scummvm/scummvm-1.8.1-r1.ebuild | 107 -
 3 files changed, 218 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index c19aaec35bd..a14c9fdd47f 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,4 +1,2 @@
-DIST scummvm-1.8.0.tar.xz 17385064 BLAKE2B 
02298f525f38d07f89ed829585498ca3cf807b6f1aa9f7601e5f1759a3d908cd99cd19c3a21169b7df9db52eb5b38e2b56d4eac6bdca3ba01c972e5a5054827b
 SHA512 
2fb25467854d6115cf09fd40536728e2c1943c16d8bcb29ebbc3c37fa5dc750a72258e0b0dac6244e5ddcc5f2dfc69af3d7fdff83c98a92a546f8669daa8da27
-DIST scummvm-1.8.1.tar.xz 17807468 BLAKE2B 
c5ba8c54b96467d4362b7a41afafd5686ae817b619a2bcbc5c82f10fbc0f89af78720ec187503dd3e4ed2577932cf31f84c666cdabbddf579c0f79bfeb1a
 SHA512 
e67ee332668b14432dcd675051384bd4fee2c1a0ddf44f6f8aeaf889d5027a834187e2632d18959583fa258cf03f259a54fd2d88120fa62ef7496232b4e6bdb4
 DIST scummvm-1.9.0.tar.xz 22020384 BLAKE2B 
10f2c20cf1e32a60897c9e909e0bfda7827a646eb38aaf4923b76708fb5b797c66f94d92f7c095ca77570712223cd0d037fccc563c709448d4d2093299050773
 SHA512 
c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
 DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 
303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948
 SHA512 
5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c

diff --git a/games-engines/scummvm/scummvm-1.8.0.ebuild 
b/games-engines/scummvm/scummvm-1.8.0.ebuild
deleted file mode 100644
index 4edb099d800..000
--- a/games-engines/scummvm/scummvm-1.8.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs games
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/;
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
-   zlib? ( sys-libs/zlib )
-   jpeg? ( virtual/jpeg:0 )
-   png? ( media-libs/libpng:0 )
-   vorbis? ( media-libs/libogg media-libs/libvorbis )
-   theora? ( media-libs/libtheora )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   mp3? ( media-libs/libmad )
-   mpeg2? ( media-libs/libmpeg2 )
-   flac? ( media-libs/flac )
-   opengl? ( virtual/opengl )
-   truetype? ( media-libs/freetype:2 )
-   fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-   # -g isn't needed for nasm here
-   sed -i \
-   -e '/NASMFLAGS/ s/-g//' \
-   configure || die
-   sed -i \
-   -e '/INSTALL.*doc/d' \
-   -e '/INSTALL.*\/pixmaps/d' \
-   -e 's/-s //' \
-   ports.mk || die
-}
-
-src_configure() {
-   local myconf
-
-   # bug #137547
-   use fluidsynth || myconf="${myconf} --disable-fluidsynth"
-
-   use x86 && append-ldflags -Wl,-z,noexecstack
-
-   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-   ./configure \
-   --backend=sdl \
-   --host=$CHOST \
-   --enable-verbose-build \
-   --prefix=/usr \
-   --bindir="${GAMES_BINDIR}" \
-   --datadir="${GAMES_DATADIR}"/${PN} \
-   --libdir="${GAMES_LIBDIR}" \
-   --enable-zlib \
-   $(use_enable debug) \
-   $(use_enable !debug release-mode) \
-   $(use_enable zlib) \
-   $(use_enable aac faad) \
-   $(use_enable alsa) \
-   $(use_enable jpeg) \
-   $(use_enable png) \
-   $(use_enable mp3 mad) \
-   $(use_enable mpeg2) \
-   $(use_enable flac) \
-   $(use_enable opengl) \
-

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

2017-01-20 Thread David Seifert

commit: d16e6562ac67ff2a4daf45db371e97d9621e6fd9
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jan 20 15:50:45 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan 20 16:21:05 2017 +
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..
--- 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..
--- 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/

2017-01-20 Thread David Seifert

commit: bf7cfc7903bed04124d845f1c055d5231487db14
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jan 20 15:48:11 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan 20 16:21:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7cfc79

games-engines/scummvm: Remove old

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

 games-engines/scummvm/Manifest|   1 -
 games-engines/scummvm/scummvm-1.7.0-r2.ebuild | 110 --
 2 files changed, 111 deletions(-)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index cc8c733..767c218 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,4 +1,3 @@
-DIST scummvm-1.7.0.tar.bz2 20018016 SHA256 
d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 SHA512 
0133feb2df58461fb0e42b1e84cfb309bd964dad239f7ca0c7529edd4f4716895a45491e31597ec6f6d17361b0ce8f73c317399db07a1249b2ab570e4829000e
 WHIRLPOOL 
077eb74cf46dfb15eaa2d473b627d953bc8e13bd0ae87a4fdc16282e468cf237bd9173b761cc9f89b9d6a13ce76db40aa67d5092e2e77eba2a0c6dab097b0fb4
 DIST scummvm-1.8.0.tar.xz 17385064 SHA256 
a85c23a2b1fcb7586a7527ecdbdf6c899a45ecbdcba28b9322057dc27914daa8 SHA512 
2fb25467854d6115cf09fd40536728e2c1943c16d8bcb29ebbc3c37fa5dc750a72258e0b0dac6244e5ddcc5f2dfc69af3d7fdff83c98a92a546f8669daa8da27
 WHIRLPOOL 
55202291d09c86b250dc0ee24fdd3b34dd54924c4b5bb9889d6f2ef84f06db3caebc6bb36a9c1a9ccddd93cfdfaf5feac4982b4b0dc74305819af75031a68524
 DIST scummvm-1.8.1.tar.xz 17807468 SHA256 
935f53d7e4c460fbc22c58fee5007d4858891e4961831f53f575a3594b7f612a SHA512 
e67ee332668b14432dcd675051384bd4fee2c1a0ddf44f6f8aeaf889d5027a834187e2632d18959583fa258cf03f259a54fd2d88120fa62ef7496232b4e6bdb4
 WHIRLPOOL 
597e6f4f21c4b80720a86d1f55518ba834d814ea9b9de365e19bdd070b0c8a81ce451d63169597bd54eb6e86876b5506a9f361d8c649c689dce304597b9390af
 DIST scummvm-1.9.0.tar.xz 22020384 SHA256 
2417edcb1ad51ca05a817c58aeee610bc6db5442984e8cf28e8a5fd914e8ae05 SHA512 
c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
 WHIRLPOOL 
b9b09c90aa70c4a0aec2eae9fafba96d6ae2db6d0780ef3fc8bcf2d3bccba59b1b347635f85df1ce98183580132e8b8a00e8443123d13e1f20686b0fc862e2c0

diff --git a/games-engines/scummvm/scummvm-1.7.0-r2.ebuild 
b/games-engines/scummvm/scummvm-1.7.0-r2.ebuild
deleted file mode 100644
index dfa2bc8..
--- a/games-engines/scummvm/scummvm-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs games
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/;
-SRC_URI="mirror://sourceforge/scummvm/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
-   zlib? ( sys-libs/zlib )
-   jpeg? ( virtual/jpeg:0 )
-   png? ( media-libs/libpng:0 )
-   vorbis? ( media-libs/libogg media-libs/libvorbis )
-   theora? ( media-libs/libtheora )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   mp3? ( media-libs/libmad )
-   mpeg2? ( media-libs/libmpeg2 )
-   flac? ( media-libs/flac )
-   opengl? ( virtual/opengl )
-   truetype? ( media-libs/freetype:2 )
-   fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
-   x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-   # -g isn't needed for nasm here
-   sed -i \
-   -e '/NASMFLAGS/ s/-g//' \
-   configure || die
-   sed -i \
-   -e '/INSTALL.*doc/d' \
-   -e '/INSTALL.*\/pixmaps/d' \
-   -e 's/-s //' \
-   ports.mk || die
-}
-
-src_configure() {
-   local myconf
-
-   # bug #137547
-   use fluidsynth || myconf="${myconf} --disable-fluidsynth"
-
-   use x86 && append-ldflags -Wl,-z,noexecstack
-
-   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-   ./configure \
-   --backend=sdl \
-   --host=$CHOST \
-   --enable-verbose-build \
-   --prefix=/usr \
-   --bindir="${GAMES_BINDIR}" \
-   --datadir="${GAMES_DATADIR}"/${PN} \
-   --libdir="${GAMES_LIBDIR}" \
-   --enable-zlib \
-   $(use_enable debug) \
-   $(use_enable !debug release-mode) \
-   $(use_enable zlib) \
-   $(use_enable aac faad) \
-   $(use_enable alsa) \
-

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

2017-01-20 Thread Agostino Sarubbo

commit: b1a3956199fab47d1db51ca0053b7fe9a451554a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 20 11:03:02 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 20 11:04:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a39561

games-engines/scummvm-tools: ppc64 stable wrt bug #580574

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
index afdedff..c22499e 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 
SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files

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

2017-01-19 Thread Austin English

commit: cd3aa48996a7801f8a366f471e3851e433aa662c
Author: Austin English  gentoo  org>
AuthorDate: Thu Jan 19 23:52:54 2017 +
Commit: Austin English  gentoo  org>
CommitDate: Fri Jan 20 01:09:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd3aa489

games-engines/scummvm-tools: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: Portage-2.3.2, Repoman-2.3.1

 .../scummvm-tools/scummvm-tools-1.8.0-r1.ebuild| 59 ++
 1 file changed, 59 insertions(+)

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
new file mode 100644
index ..94c6d12
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+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
+}

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

2016-12-09 Thread Lars Wendler

commit: 30e010f41fc64c79573f2153d354553b5fc0832e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec  9 23:07:57 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec  9 23:08:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e010f4

games-engines/scummvm: Removed old.

Package-Manager: portage-2.3.3

 games-engines/scummvm/scummvm-1.8.1.ebuild | 110 -
 1 file changed, 110 deletions(-)

diff --git a/games-engines/scummvm/scummvm-1.8.1.ebuild 
b/games-engines/scummvm/scummvm-1.8.1.ebuild
deleted file mode 100644
index 6aff612..
--- a/games-engines/scummvm/scummvm-1.8.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs games
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/;
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
-   zlib? ( sys-libs/zlib )
-   jpeg? ( virtual/jpeg:0 )
-   png? ( media-libs/libpng:0 )
-   vorbis? ( media-libs/libogg media-libs/libvorbis )
-   theora? ( media-libs/libtheora )
-   aac? ( media-libs/faad2 )
-   alsa? ( media-libs/alsa-lib )
-   mp3? ( media-libs/libmad )
-   mpeg2? ( media-libs/libmpeg2 )
-   flac? ( media-libs/flac )
-   opengl? ( virtual/opengl )
-   truetype? ( media-libs/freetype:2 )
-   fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-   # -g isn't needed for nasm here
-   sed -i \
-   -e '/NASMFLAGS/ s/-g//' \
-   configure || die
-   sed -i \
-   -e '/INSTALL.*doc/d' \
-   -e '/INSTALL.*\/pixmaps/d' \
-   -e 's/-s //' \
-   ports.mk || die
-}
-
-src_configure() {
-   local myconf
-
-   # bug #137547
-   use fluidsynth || myconf="${myconf} --disable-fluidsynth"
-
-   use x86 && append-ldflags -Wl,-z,noexecstack
-
-   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-   ./configure \
-   --backend=sdl \
-   --host=$CHOST \
-   --enable-verbose-build \
-   --prefix=/usr \
-   --bindir="${GAMES_BINDIR}" \
-   --datadir="${GAMES_DATADIR}"/${PN} \
-   --libdir="${GAMES_LIBDIR}" \
-   --enable-zlib \
-   $(use_enable debug) \
-   $(use_enable !debug release-mode) \
-   $(use_enable zlib) \
-   $(use_enable aac faad) \
-   $(use_enable alsa) \
-   $(use_enable jpeg) \
-   $(use_enable png) \
-   $(use_enable mp3 mad) \
-   $(use_enable mpeg2) \
-   $(use_enable flac) \
-   $(use_enable opengl) \
-   $(use_enable vorbis) \
-   $(use_enable theora theoradec) \
-   $(use_enable truetype freetype2) \
-   $(use_enable x86 nasm) \
-   $(use unsupported && echo --enable-all-engines) \
-   ${myconf} ${EXTRA_ECONF} || die
-}
-
-src_compile() {
-   emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-   default
-   doicon -s scalable icons/scummvm.svg
-   make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
-   prepgamesdirs
-}
-
-pkg_preinst() {
-   games_pkg_preinst
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   games_pkg_postinst
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}

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

2016-12-09 Thread Lars Wendler

commit: a95e810cf9c9c33f9fc7855ac3e7b063b1b9e2f8
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec  9 23:07:10 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec  9 23:08:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95e810c

games-engines/scummvm: Bumped to version 1.9.0

Package-Manager: portage-2.3.3

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-1.9.0.ebuild | 103 +
 2 files changed, 104 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 5fea61a..cc8c733 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,3 +1,4 @@
 DIST scummvm-1.7.0.tar.bz2 20018016 SHA256 
d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 SHA512 
0133feb2df58461fb0e42b1e84cfb309bd964dad239f7ca0c7529edd4f4716895a45491e31597ec6f6d17361b0ce8f73c317399db07a1249b2ab570e4829000e
 WHIRLPOOL 
077eb74cf46dfb15eaa2d473b627d953bc8e13bd0ae87a4fdc16282e468cf237bd9173b761cc9f89b9d6a13ce76db40aa67d5092e2e77eba2a0c6dab097b0fb4
 DIST scummvm-1.8.0.tar.xz 17385064 SHA256 
a85c23a2b1fcb7586a7527ecdbdf6c899a45ecbdcba28b9322057dc27914daa8 SHA512 
2fb25467854d6115cf09fd40536728e2c1943c16d8bcb29ebbc3c37fa5dc750a72258e0b0dac6244e5ddcc5f2dfc69af3d7fdff83c98a92a546f8669daa8da27
 WHIRLPOOL 
55202291d09c86b250dc0ee24fdd3b34dd54924c4b5bb9889d6f2ef84f06db3caebc6bb36a9c1a9ccddd93cfdfaf5feac4982b4b0dc74305819af75031a68524
 DIST scummvm-1.8.1.tar.xz 17807468 SHA256 
935f53d7e4c460fbc22c58fee5007d4858891e4961831f53f575a3594b7f612a SHA512 
e67ee332668b14432dcd675051384bd4fee2c1a0ddf44f6f8aeaf889d5027a834187e2632d18959583fa258cf03f259a54fd2d88120fa62ef7496232b4e6bdb4
 WHIRLPOOL 
597e6f4f21c4b80720a86d1f55518ba834d814ea9b9de365e19bdd070b0c8a81ce451d63169597bd54eb6e86876b5506a9f361d8c649c689dce304597b9390af
+DIST scummvm-1.9.0.tar.xz 22020384 SHA256 
2417edcb1ad51ca05a817c58aeee610bc6db5442984e8cf28e8a5fd914e8ae05 SHA512 
c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
 WHIRLPOOL 
b9b09c90aa70c4a0aec2eae9fafba96d6ae2db6d0780ef3fc8bcf2d3bccba59b1b347635f85df1ce98183580132e8b8a00e8443123d13e1f20686b0fc862e2c0

diff --git a/games-engines/scummvm/scummvm-1.9.0.ebuild 
b/games-engines/scummvm/scummvm-1.9.0.ebuild
new file mode 100644
index ..d004d13
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.9.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils toolchain-funcs
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="http://scummvm.sourceforge.net/;
+SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   zlib? ( sys-libs/zlib )
+   jpeg? ( virtual/jpeg:0 )
+   png? ( media-libs/libpng:0 )
+   vorbis? ( media-libs/libogg media-libs/libvorbis )
+   theora? ( media-libs/libtheora )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   flac? ( media-libs/flac )
+   opengl? ( virtual/opengl )
+   truetype? ( media-libs/freetype:2 )
+   fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   use x86 && append-ldflags -Wl,-z,noexecstack
+
+   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
+   SDL_CONFIG="sdl2-config" \
+   ./configure \
+   --backend=sdl \
+   --host=${CHOST} \
+   --enable-verbose-build \
+   --prefix=/usr \
+   --libdir="/usr/$(get_libdir)" \
+   --opengl-mode=$(usex opengl auto none) \
+   $(use_enable aac faad) \
+   $(use_enable alsa) \
+   $(use_enable debug) \
+   $(use_enable !debug release-mode) \
+   $(use_enable flac) \
+   $(usex fluidsynth '' --disable-fluidsynth) \
+   $(use_enable jpeg) \
+   $(use_enable mp3 mad) \
+   $(use_enable mpeg2)

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

2016-11-10 Thread Lars Wendler

commit: 14aa965fafaadfdc2cd5ae70934edbb40091a0e6
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Nov 10 15:11:39 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov 10 15:11:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14aa965f

games-engines/scummvm: Use libsdl2 (bug #599394).

Bump to EAPI-6.

Package-Manager: portage-2.3.2

 games-engines/scummvm/scummvm-1.8.1-r1.ebuild | 108 ++
 1 file changed, 108 insertions(+)

diff --git a/games-engines/scummvm/scummvm-1.8.1-r1.ebuild 
b/games-engines/scummvm/scummvm-1.8.1-r1.ebuild
new file mode 100644
index ..2ee7ace
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.8.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils toolchain-funcs
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="http://scummvm.sourceforge.net/;
+SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
+   zlib? ( sys-libs/zlib )
+   jpeg? ( virtual/jpeg:0 )
+   png? ( media-libs/libpng:0 )
+   vorbis? ( media-libs/libogg media-libs/libvorbis )
+   theora? ( media-libs/libtheora )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   flac? ( media-libs/flac )
+   opengl? ( virtual/opengl )
+   truetype? ( media-libs/freetype:2 )
+   fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+   default
+
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   local myconf
+
+   # bug #137547
+   use fluidsynth || myconf="${myconf} --disable-fluidsynth"
+
+   use x86 && append-ldflags -Wl,-z,noexecstack
+
+   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
+   SDL_CONFIG="sdl2-config" \
+   ./configure \
+   --backend=sdl \
+   --host=$CHOST \
+   --enable-verbose-build \
+   --prefix=/usr \
+   --libdir="/usr/$(get_libdir)" \
+   --enable-zlib \
+   $(use_enable debug) \
+   $(use_enable !debug release-mode) \
+   $(use_enable zlib) \
+   $(use_enable aac faad) \
+   $(use_enable alsa) \
+   $(use_enable jpeg) \
+   $(use_enable png) \
+   $(use_enable mp3 mad) \
+   $(use_enable mpeg2) \
+   $(use_enable flac) \
+   $(use_enable opengl) \
+   $(use_enable vorbis) \
+   $(use_enable theora theoradec) \
+   $(use_enable truetype freetype2) \
+   $(use_enable x86 nasm) \
+   $(use unsupported && echo --enable-all-engines) \
+   ${myconf} ${EXTRA_ECONF} || die
+}
+
+src_compile() {
+   emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+   default
+   doicon -s scalable icons/scummvm.svg
+   make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}

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

2016-07-06 Thread Agostino Sarubbo

commit: b64a89833dcd0a2bcf59096c272b1b400ccebfcb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul  6 09:22:17 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul  6 09:22:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64a8983

games-engines/scummvm-tools: ppc stable wrt bug #580574

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
index 48fd4a0..afdedff 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files

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

2016-06-25 Thread Agostino Sarubbo

commit: d7bc05984b973aea250ed64a8548bc017e65ae08
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jun 25 20:11:26 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jun 25 20:13:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7bc0598

games-engines/scummvm-tools: x86 stable wrt bug #580574

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
index 33f2d86..48fd4a0 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files

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

2016-06-14 Thread Michael Sterrett

commit: 53db1425bce36548ea3e530367e5bff21da18537
Author: Michael Sterrett  gentoo  org>
AuthorDate: Mon Jun 13 16:01:50 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Jun 14 14:59:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53db1425

games-engines/scummvm: version bump

Package-Manager: portage-2.2.28

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-1.8.1.ebuild | 110 +
 2 files changed, 111 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index e334089..5fea61a 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1,3 @@
 DIST scummvm-1.7.0.tar.bz2 20018016 SHA256 
d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 SHA512 
0133feb2df58461fb0e42b1e84cfb309bd964dad239f7ca0c7529edd4f4716895a45491e31597ec6f6d17361b0ce8f73c317399db07a1249b2ab570e4829000e
 WHIRLPOOL 
077eb74cf46dfb15eaa2d473b627d953bc8e13bd0ae87a4fdc16282e468cf237bd9173b761cc9f89b9d6a13ce76db40aa67d5092e2e77eba2a0c6dab097b0fb4
 DIST scummvm-1.8.0.tar.xz 17385064 SHA256 
a85c23a2b1fcb7586a7527ecdbdf6c899a45ecbdcba28b9322057dc27914daa8 SHA512 
2fb25467854d6115cf09fd40536728e2c1943c16d8bcb29ebbc3c37fa5dc750a72258e0b0dac6244e5ddcc5f2dfc69af3d7fdff83c98a92a546f8669daa8da27
 WHIRLPOOL 
55202291d09c86b250dc0ee24fdd3b34dd54924c4b5bb9889d6f2ef84f06db3caebc6bb36a9c1a9ccddd93cfdfaf5feac4982b4b0dc74305819af75031a68524
+DIST scummvm-1.8.1.tar.xz 17807468 SHA256 
935f53d7e4c460fbc22c58fee5007d4858891e4961831f53f575a3594b7f612a SHA512 
e67ee332668b14432dcd675051384bd4fee2c1a0ddf44f6f8aeaf889d5027a834187e2632d18959583fa258cf03f259a54fd2d88120fa62ef7496232b4e6bdb4
 WHIRLPOOL 
597e6f4f21c4b80720a86d1f55518ba834d814ea9b9de365e19bdd070b0c8a81ce451d63169597bd54eb6e86876b5506a9f361d8c649c689dce304597b9390af

diff --git a/games-engines/scummvm/scummvm-1.8.1.ebuild 
b/games-engines/scummvm/scummvm-1.8.1.ebuild
new file mode 100644
index 000..6aff612
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.8.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils toolchain-funcs games
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="http://scummvm.sourceforge.net/;
+SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
+   zlib? ( sys-libs/zlib )
+   jpeg? ( virtual/jpeg:0 )
+   png? ( media-libs/libpng:0 )
+   vorbis? ( media-libs/libogg media-libs/libvorbis )
+   theora? ( media-libs/libtheora )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   flac? ( media-libs/flac )
+   opengl? ( virtual/opengl )
+   truetype? ( media-libs/freetype:2 )
+   fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   local myconf
+
+   # bug #137547
+   use fluidsynth || myconf="${myconf} --disable-fluidsynth"
+
+   use x86 && append-ldflags -Wl,-z,noexecstack
+
+   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
+   ./configure \
+   --backend=sdl \
+   --host=$CHOST \
+   --enable-verbose-build \
+   --prefix=/usr \
+   --bindir="${GAMES_BINDIR}" \
+   --datadir="${GAMES_DATADIR}"/${PN} \
+   --libdir="${GAMES_LIBDIR}" \
+   --enable-zlib \
+   $(use_enable debug) \
+   $(use_enable !debug release-mode) \
+   $(use_enable zlib) \
+   $(use_enable aac faad) \
+   $(use_enable alsa) \
+   $(use_enable jpeg) \
+   $(use_enable png) \
+   $(use_enable mp3 mad) \
+   $(use_enable mpeg2) \
+   $(use_enable flac) \
+   $(use_enable opengl) \
+   $(use_enable vorbis) \
+   $(use_enable theora theoradec) \
+   $(use_enable truetype freetype2) \
+   $(use_enable x86 nasm) \
+   $(use

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

2016-05-13 Thread Agostino Sarubbo

commit: 7866e96ad0fc07ebc972abdd2322d24b6e374f20
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 13 14:49:30 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 13 14:49:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7866e96a

games-engines/scummvm-tools: amd64 stable wrt bug #580574

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
index 53e6d1b..33f2d86 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files

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

2016-03-20 Thread Michael Sterrett

commit: 41d86e3daf1f621b1f9fcf9d2445e795bbf84630
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Mar 20 20:26:38 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun Mar 20 20:51:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d86e3d

games-engines/scummvm-tools: clean old

Package-Manager: portage-2.2.26

 .../scummvm-tools/scummvm-tools-1.7.0.ebuild   | 56 --
 1 file changed, 56 deletions(-)

diff --git a/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild
deleted file mode 100644
index a10bc42..000
--- a/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER=2.8
-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:2.8"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   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}" \
-   $(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/files/, games-engines/scummvm-tools/

2016-03-14 Thread Michael Sterrett

commit: 07c0b096283679b22592c21f6905eea1e36dc1e2
Author: Michael Sterrett  gentoo  org>
AuthorDate: Mon Mar 14 07:09:34 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Mon Mar 14 07:10:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c0b096

games-engines/scummvm-tools: version bump

Package-Manager: portage-2.2.26

 games-engines/scummvm-tools/Manifest   |  1 +
 .../files/scummvm-tools-1.8.0-binprefix.patch  | 11 
 .../scummvm-tools/scummvm-tools-1.8.0.ebuild   | 58 ++
 3 files changed, 70 insertions(+)

diff --git a/games-engines/scummvm-tools/Manifest 
b/games-engines/scummvm-tools/Manifest
index 17fa75b..248076b 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1 +1,2 @@
 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.8.0-binprefix.patch 
b/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch
new file mode 100644
index 000..604db07
--- /dev/null
+++ b/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch
@@ -0,0 +1,11 @@
+--- 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.8.0.ebuild 
b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
new file mode 100644
index 000..53e6d1b
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 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="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz;
+
+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}
+   app-arch/xz-utils
+   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() {
+   EXEPREFIX="${PN}-" default
+   prepgamesdirs
+}

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

2016-03-12 Thread Michael Sterrett

commit: cefc8be569d168ba6e0ff69c6e78c18766106e5c
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Mar 13 07:02:55 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun Mar 13 07:03:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cefc8be5

games-engines/scummvm: version bump

Package-Manager: portage-2.2.26

 games-engines/scummvm/Manifest |   1 +
 games-engines/scummvm/scummvm-1.8.0.ebuild | 110 +
 2 files changed, 111 insertions(+)

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index c25de0b..e334089 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1 +1,2 @@
 DIST scummvm-1.7.0.tar.bz2 20018016 SHA256 
d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 SHA512 
0133feb2df58461fb0e42b1e84cfb309bd964dad239f7ca0c7529edd4f4716895a45491e31597ec6f6d17361b0ce8f73c317399db07a1249b2ab570e4829000e
 WHIRLPOOL 
077eb74cf46dfb15eaa2d473b627d953bc8e13bd0ae87a4fdc16282e468cf237bd9173b761cc9f89b9d6a13ce76db40aa67d5092e2e77eba2a0c6dab097b0fb4
+DIST scummvm-1.8.0.tar.xz 17385064 SHA256 
a85c23a2b1fcb7586a7527ecdbdf6c899a45ecbdcba28b9322057dc27914daa8 SHA512 
2fb25467854d6115cf09fd40536728e2c1943c16d8bcb29ebbc3c37fa5dc750a72258e0b0dac6244e5ddcc5f2dfc69af3d7fdff83c98a92a546f8669daa8da27
 WHIRLPOOL 
55202291d09c86b250dc0ee24fdd3b34dd54924c4b5bb9889d6f2ef84f06db3caebc6bb36a9c1a9ccddd93cfdfaf5feac4982b4b0dc74305819af75031a68524

diff --git a/games-engines/scummvm/scummvm-1.8.0.ebuild 
b/games-engines/scummvm/scummvm-1.8.0.ebuild
new file mode 100644
index 000..6aff612
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.8.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils toolchain-funcs games
+
+DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts 
adventures"
+HOMEPAGE="http://scummvm.sourceforge.net/;
+SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype 
unsupported vorbis zlib"
+RESTRICT="test"  # it only looks like there's a test there #77507
+
+RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
+   zlib? ( sys-libs/zlib )
+   jpeg? ( virtual/jpeg:0 )
+   png? ( media-libs/libpng:0 )
+   vorbis? ( media-libs/libogg media-libs/libvorbis )
+   theora? ( media-libs/libtheora )
+   aac? ( media-libs/faad2 )
+   alsa? ( media-libs/alsa-lib )
+   mp3? ( media-libs/libmad )
+   mpeg2? ( media-libs/libmpeg2 )
+   flac? ( media-libs/flac )
+   opengl? ( virtual/opengl )
+   truetype? ( media-libs/freetype:2 )
+   fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+   # -g isn't needed for nasm here
+   sed -i \
+   -e '/NASMFLAGS/ s/-g//' \
+   configure || die
+   sed -i \
+   -e '/INSTALL.*doc/d' \
+   -e '/INSTALL.*\/pixmaps/d' \
+   -e 's/-s //' \
+   ports.mk || die
+}
+
+src_configure() {
+   local myconf
+
+   # bug #137547
+   use fluidsynth || myconf="${myconf} --disable-fluidsynth"
+
+   use x86 && append-ldflags -Wl,-z,noexecstack
+
+   # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
+   ./configure \
+   --backend=sdl \
+   --host=$CHOST \
+   --enable-verbose-build \
+   --prefix=/usr \
+   --bindir="${GAMES_BINDIR}" \
+   --datadir="${GAMES_DATADIR}"/${PN} \
+   --libdir="${GAMES_LIBDIR}" \
+   --enable-zlib \
+   $(use_enable debug) \
+   $(use_enable !debug release-mode) \
+   $(use_enable zlib) \
+   $(use_enable aac faad) \
+   $(use_enable alsa) \
+   $(use_enable jpeg) \
+   $(use_enable png) \
+   $(use_enable mp3 mad) \
+   $(use_enable mpeg2) \
+   $(use_enable flac) \
+   $(use_enable opengl) \
+   $(use_enable vorbis) \
+   $(use_enable theora theoradec) \
+   $(use_enable truetype freetype2) \
+   $(use_enable x86 nasm) \
+   $(use unsupported && echo --enable-all-engines) \
+   ${myconf} ${EXTRA_ECONF} || die
+}
+
+src_compile() {
+   emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+   default
+   doicon -s scalable icons/scummvm.svg
+   make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
+   prepgamesdirs
+}
+
+pkg_preinst() {
+

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

2015-12-21 Thread Agostino Sarubbo

commit: 05b76f4ff3af1c6edaffa6a46c37d3760a4e2cb0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 21 12:40:29 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 21 12:40:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b76f4f

games-engines/scummvm-tools: amd64 stable wrt bug #568820

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 2ae1a49..babf5c5 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scummvm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files

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

2015-11-19 Thread Michael Sterrett

commit: d856073affe5f8715a64ee42ab7bb36c0dff5420
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Nov 19 18:39:29 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Nov 19 18:39:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d856073a

avoid trying to auto-use tremor (bug #566210)

Package-Manager: portage-2.2.20.1

 games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

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
index 6c675fe..2ae1a49 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
@@ -42,6 +42,7 @@ src_configure() {
--prefix="${GAMES_PREFIX}" \
--libdir="${GAMES_PREFIX}/lib" \
--datadir="${GAMES_DATADIR}" \
+   --disable-tremor \
$(use_enable flac) \
$(use_enable iconv) \
$(use_enable iconv freetype) \

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

2015-10-25 Thread Pacho Ramos

commit: 888e9aa0168d733e3afaf7bc30e58761f5b31873
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 14:20:07 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 14:20:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=888e9aa0

games-engines/scummvm-tools: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 .../scummvm-tools/scummvm-tools-1.7.0-r1.ebuild| 57 ++
 1 file changed, 57 insertions(+)

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
new file mode 100644
index 000..6c675fe
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
@@ -0,0 +1,57 @@
+# 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}" \
+   $(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
+}

78 matches

Mail list logo