[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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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
+}