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

2024-05-21 Thread James Le Cuirot 
commit: 9853b42007f9c58cbe9d0d938c6772f2834a8051
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue May 21 21:59:46 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue May 21 21:59:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9853b420

games-engines/frotz: Bump to 2.55_pre20240518 snapshot, drop old 2.54

2.54 builds with GCC 13 with lots of warnings but fails with 12 and 14. This
snapshot looks much better. Admittedly, I've only really build tested it.

Closes: https://bugs.gentoo.org/932295
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/frotz/Manifest   |   2 +-
 games-engines/frotz/files/frotz-2.53-uint32.patch  | 475 -
 games-engines/frotz/files/frotz-stray-dollar.patch |  26 ++
 ...z-2.54.ebuild => frotz-2.55_pre20240518.ebuild} |   9 +-
 4 files changed, 32 insertions(+), 480 deletions(-)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 639be0c1e3e8..f25404e287db 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1 +1 @@
-DIST frotz-2.54.tar.bz2 354087 BLAKE2B 
e3a77038605333ead060ac8b9c1a7fbcbd71ae4d91eae6c7f5dda482fba6113ff32c6e4b7aef701931ed260278522bc5a2b98f61cf939b68166d6ed32e9eba16
 SHA512 
f608007e4eb979b928128d22d960621100c6f7042e9d8fe1bdf44137da94c1c2aa4778be0309056763185eaab2662e3604bd7396c9f5cbf98ce52db626225295
+DIST frotz-2.55_pre20240518.tar.bz2 361873 BLAKE2B 
feffedec989adfda7e949ab4997dff6496e1d9fef4b55902cd8430556587e54996872107c70a1ecc6db4bc6e29357ec101df9f8f411043cddfbf03bc46d4fe4d
 SHA512 
b18670d6360fff48c20e8d26cb5173784ea900128a8e08d39625297aeae6eb5ea5be7fe361785b3863f25667649d935f2b9edb9d92751388bfaaa00edf678ec2

diff --git a/games-engines/frotz/files/frotz-2.53-uint32.patch 
b/games-engines/frotz/files/frotz-2.53-uint32.patch
deleted file mode 100644
index 18e7d244c272..
--- a/games-engines/frotz/files/frotz-2.53-uint32.patch
+++ /dev/null
@@ -1,475 +0,0 @@
-Description: Use uint32_t instead of ulong
-Author: Stephen Kitt 
-
-When built with hardening enabled, there’s a ulong/uint32_t definition
-conflict; since the type is supposed to be uint32_t, use that
-directly.
-
 a/src/sdl/sf_frotz.h
-+++ b/src/sdl/sf_frotz.h
-@@ -12,13 +12,13 @@
- #include "../blorb/blorb.h"
- 
- #include 
-+#include 
- typedef uint8_t byte;
- typedef uint16_t word;
--#define ulong uint32_t
- 
- typedef struct {
-   bb_result_t bbres;
--  ulong type;
-+  uint32_t type;
-   FILE *file;
- } myresource;
- 
-@@ -54,7 +54,7 @@
- #endif
- 
- /* this assumes RGBA with lsb = R */
--static inline ulong RGB5ToTrue(word w)
-+static inline uint32_t RGB5ToTrue(word w)
- {
-   int _r = w & 0x001F;
-   int _g = (w & 0x03E0) >> 5;
-@@ -62,10 +62,10 @@
-   _r = (_r << 3) | (_r >> 2);
-   _g = (_g << 3) | (_g >> 2);
-   _b = (_b << 3) | (_b >> 2);
--  return (ulong) (_r | (_g << 8) | (_b << 16));
-+  return (uint32_t) (_r | (_g << 8) | (_b << 16));
- }
- 
--static inline word TrueToRGB5(ulong u)
-+static inline word TrueToRGB5(uint32_t u)
- {
-   return (word) (((u >> 3) & 0x001f) | ((u >> 6) & 0x03e0) |
-  ((u >> 9) & 0x7c00));
-@@ -81,10 +81,10 @@
- extern int m_v6scale;
- extern double m_gfxScale_w;
- extern double m_gfxScale_h;
--extern ulong m_defaultFore;
--extern ulong m_defaultBack;
--extern ulong m_colours[11];
--extern ulong m_nonStdColours[NON_STD_COLS];
-+extern uint32_t m_defaultFore;
-+extern uint32_t m_defaultBack;
-+extern uint32_t m_colours[11];
-+extern uint32_t m_nonStdColours[NON_STD_COLS];
- extern int m_nonStdIndex;
- extern bool m_exitPause;
- extern bool m_lineInput;
-@@ -118,7 +118,7 @@
-   int number; /* 0 means unallocated */
-   int width, height;
-   byte *pixels;
--  ulong palette[16];
-+  uint32_t palette[16];
-   int palette_entries;
-   int transparentcolor;
-   bool adaptive;
-@@ -190,9 +190,9 @@
- 
- void sf_readsettings();
- 
--ulong sf_GetColour(int colour);
--ulong sf_GetDefaultColour(bool fore);
--int sf_GetColourIndex(ulong colour);
-+uint32_t sf_GetColour(int colour);
-+uint32_t sf_GetDefaultColour(bool fore);
-+int sf_GetColourIndex(uint32_t colour);
- 
- void sf_initvideo(int w, int h, int full);
- 
-@@ -221,7 +221,7 @@
- 
- bool sf_IsInfocomV6(void);
- 
--ulong sf_blend(int a, ulong s, ulong d);
-+uint32_t sf_blend(int a, uint32_t s, uint32_t d);
- 
- void sf_sleep(int millisecs);
- 
-@@ -234,8 +234,8 @@
- 
- int sf_pkread(FILE * f, int foffs, void **out, int *size);
- 
--ulong *sf_savearea(int x, int y, int w, int h);
--void sf_restoreareaandfree(ulong * s);
-+uint32_t *sf_savearea(int x, int y, int w, int h);
-+void sf_restoreareaandfree(uint32_t * s);
- #define SF_NOTIMP (-)
- 
- zword sf_read_key(int timeout, bool cursor, bool allowed, bool text);
-@@ -243,7 +243,7 @@
- int sf_user_fdialog(bool exist, const char *def, const char *filt,
-   const char *title,

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

2024-05-19 Thread James Le Cuirot 
commit: 35a74f008450cc8b5fe842e994493f87d308e24c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 19 15:58:01 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 19 16:16:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a74f00

games-engines/frotz: Bump to 2.54, drop old 2.53, fix deps, EAPI 8

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

 games-engines/frotz/Manifest| 2 +-
 games-engines/frotz/{frotz-2.53-r1.ebuild => frotz-2.54.ebuild} | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 9c29a2c2b7c3..639be0c1e3e8 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1 +1 @@
-DIST frotz-2.53.tar.bz2 375800 BLAKE2B 
a3d14d11540cb12ed6e5326207946e26b0b3b85e13c50e7431f3901cfb19337661b233bf29077c1efe3a9663aef6d2886bba1717c8132d68e77580692fed30d1
 SHA512 
e920529920a0b831b859323046aeae032b4b84ac0296d4ef35026fe8a62798cf5f9f4e255af38421aa21ad5507cd87287924daafc759c9b9d7a089ba7d77d808
+DIST frotz-2.54.tar.bz2 354087 BLAKE2B 
e3a77038605333ead060ac8b9c1a7fbcbd71ae4d91eae6c7f5dda482fba6113ff32c6e4b7aef701931ed260278522bc5a2b98f61cf939b68166d6ed32e9eba16
 SHA512 
f608007e4eb979b928128d22d960621100c6f7042e9d8fe1bdf44137da94c1c2aa4778be0309056763185eaab2662e3604bd7396c9f5cbf98ce52db626225295

diff --git a/games-engines/frotz/frotz-2.53-r1.ebuild 
b/games-engines/frotz/frotz-2.54.ebuild
similarity index 95%
rename from games-engines/frotz/frotz-2.53-r1.ebuild
rename to games-engines/frotz/frotz-2.54.ebuild
index 773b24490f66..a3ebae18235c 100644
--- a/games-engines/frotz/frotz-2.53-r1.ebuild
+++ b/games-engines/frotz/frotz-2.54.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -28,11 +28,11 @@ DEPEND="
)
sdl? (
media-libs/freetype:2
+   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
-   media-libs/libsdl2[sound,threads,video]
+   media-libs/libsdl2[sound,threads(+),video]
media-libs/sdl2-mixer[mod,vorbis,wav]
sys-libs/zlib
-   virtual/jpeg:0=
)
 "
 RDEPEND="${DEPEND}"

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

2024-04-29 Thread Marek Szuba 
commit: 18d3b71f6c2ac4318be2aa0737d8b6a408466bb4
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Apr 30 01:25:18 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Apr 30 01:28:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d3b71f

games-engines/frotz: fix build failure

Invoking long-overdue maintainer timeout. Debian solved this ages ago
so just use their patch.

Closes: https://bugs.gentoo.org/909321
Signed-off-by: Marek Szuba  gentoo.org>

 games-engines/frotz/files/frotz-2.53-uint32.patch | 475 ++
 games-engines/frotz/frotz-2.53-r1.ebuild  |   6 +-
 2 files changed, 480 insertions(+), 1 deletion(-)

diff --git a/games-engines/frotz/files/frotz-2.53-uint32.patch 
b/games-engines/frotz/files/frotz-2.53-uint32.patch
new file mode 100644
index ..18e7d244c272
--- /dev/null
+++ b/games-engines/frotz/files/frotz-2.53-uint32.patch
@@ -0,0 +1,475 @@
+Description: Use uint32_t instead of ulong
+Author: Stephen Kitt 
+
+When built with hardening enabled, there’s a ulong/uint32_t definition
+conflict; since the type is supposed to be uint32_t, use that
+directly.
+
+--- a/src/sdl/sf_frotz.h
 b/src/sdl/sf_frotz.h
+@@ -12,13 +12,13 @@
+ #include "../blorb/blorb.h"
+ 
+ #include 
++#include 
+ typedef uint8_t byte;
+ typedef uint16_t word;
+-#define ulong uint32_t
+ 
+ typedef struct {
+   bb_result_t bbres;
+-  ulong type;
++  uint32_t type;
+   FILE *file;
+ } myresource;
+ 
+@@ -54,7 +54,7 @@
+ #endif
+ 
+ /* this assumes RGBA with lsb = R */
+-static inline ulong RGB5ToTrue(word w)
++static inline uint32_t RGB5ToTrue(word w)
+ {
+   int _r = w & 0x001F;
+   int _g = (w & 0x03E0) >> 5;
+@@ -62,10 +62,10 @@
+   _r = (_r << 3) | (_r >> 2);
+   _g = (_g << 3) | (_g >> 2);
+   _b = (_b << 3) | (_b >> 2);
+-  return (ulong) (_r | (_g << 8) | (_b << 16));
++  return (uint32_t) (_r | (_g << 8) | (_b << 16));
+ }
+ 
+-static inline word TrueToRGB5(ulong u)
++static inline word TrueToRGB5(uint32_t u)
+ {
+   return (word) (((u >> 3) & 0x001f) | ((u >> 6) & 0x03e0) |
+  ((u >> 9) & 0x7c00));
+@@ -81,10 +81,10 @@
+ extern int m_v6scale;
+ extern double m_gfxScale_w;
+ extern double m_gfxScale_h;
+-extern ulong m_defaultFore;
+-extern ulong m_defaultBack;
+-extern ulong m_colours[11];
+-extern ulong m_nonStdColours[NON_STD_COLS];
++extern uint32_t m_defaultFore;
++extern uint32_t m_defaultBack;
++extern uint32_t m_colours[11];
++extern uint32_t m_nonStdColours[NON_STD_COLS];
+ extern int m_nonStdIndex;
+ extern bool m_exitPause;
+ extern bool m_lineInput;
+@@ -118,7 +118,7 @@
+   int number; /* 0 means unallocated */
+   int width, height;
+   byte *pixels;
+-  ulong palette[16];
++  uint32_t palette[16];
+   int palette_entries;
+   int transparentcolor;
+   bool adaptive;
+@@ -190,9 +190,9 @@
+ 
+ void sf_readsettings();
+ 
+-ulong sf_GetColour(int colour);
+-ulong sf_GetDefaultColour(bool fore);
+-int sf_GetColourIndex(ulong colour);
++uint32_t sf_GetColour(int colour);
++uint32_t sf_GetDefaultColour(bool fore);
++int sf_GetColourIndex(uint32_t colour);
+ 
+ void sf_initvideo(int w, int h, int full);
+ 
+@@ -221,7 +221,7 @@
+ 
+ bool sf_IsInfocomV6(void);
+ 
+-ulong sf_blend(int a, ulong s, ulong d);
++uint32_t sf_blend(int a, uint32_t s, uint32_t d);
+ 
+ void sf_sleep(int millisecs);
+ 
+@@ -234,8 +234,8 @@
+ 
+ int sf_pkread(FILE * f, int foffs, void **out, int *size);
+ 
+-ulong *sf_savearea(int x, int y, int w, int h);
+-void sf_restoreareaandfree(ulong * s);
++uint32_t *sf_savearea(int x, int y, int w, int h);
++void sf_restoreareaandfree(uint32_t * s);
+ #define SF_NOTIMP (-)
+ 
+ zword sf_read_key(int timeout, bool cursor, bool allowed, bool text);
+@@ -243,7 +243,7 @@
+ int sf_user_fdialog(bool exist, const char *def, const char *filt,
+   const char *title, char **res);
+ extern int (*sf_osdialog)(bool ex, const char *def, const char *filt,
+-const char *tit, char **res, ulong * sbuf, int sbp,
++const char *tit, char **res, uint32_t * sbuf, int sbp,
+ int ew, int eh, int isfull);
+ 
+ void sf_checksound(void);
+@@ -255,13 +255,13 @@
+ 
+ char *sf_searchfile(char *, int, char *, char *);
+ 
+-void sf_chline(int x, int y, ulong c, int n);
+-void sf_cvline(int x, int y, ulong c, int n);
++void sf_chline(int x, int y, uint32_t c, int n);
++void sf_cvline(int x, int y, uint32_t c, int n);
+ bool sf_flushdisplay(void);
+ void sf_getclip(int *x, int *y, int *w, int *h);
+ void sf_rect(unsigned long color, int x, int y, int w, int h);
+ void sf_setclip(int x, int y, int w, int h);
+-void sf_wpixel(int x, int y, ulong c);
++void sf_wpixel(int x, int y, uint32_t c);
+ 
+ void sf_InitProfile(const char *fn);
+ void sf_FinishProfile(void);
+--- a/src/sdl/sf_resource.c
 b/src/sdl/sf_resource.c
+@@ -51,10 +51,10 @@
+ int

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

2021-12-28 Thread Ionen Wolkens 
commit: 7d46730bd8e1110570f1cefe0140f302089fb578
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 28 14:52:36 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 28 17:00:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d46730b

games-engines/frotz: drop 2.52-r1

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

 games-engines/frotz/Manifest |  1 -
 games-engines/frotz/frotz-2.52-r1.ebuild | 75 
 2 files changed, 76 deletions(-)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 6678f254461c..9c29a2c2b7c3 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,2 +1 @@
-DIST frotz-2.52.tar.bz2 289109 BLAKE2B 
d1e97e05d1da187846c64dacdf69f34a800be97b75121dc8de63c619687ed5ccbd6b03b2391d2896a14aaad1e4f8eb51926affb92a36f1a5bad8acec91524774
 SHA512 
387e7a7fe0cffd40b639a306eef89a22421a4ff4a8e5dbcf96a1ef3b901744b3f75a671953ecdc17bde0d699e4756d470b61c8213c47315baa2700da92d06710
 DIST frotz-2.53.tar.bz2 375800 BLAKE2B 
a3d14d11540cb12ed6e5326207946e26b0b3b85e13c50e7431f3901cfb19337661b233bf29077c1efe3a9663aef6d2886bba1717c8132d68e77580692fed30d1
 SHA512 
e920529920a0b831b859323046aeae032b4b84ac0296d4ef35026fe8a62798cf5f9f4e255af38421aa21ad5507cd87287924daafc759c9b9d7a089ba7d77d808

diff --git a/games-engines/frotz/frotz-2.52-r1.ebuild 
b/games-engines/frotz/frotz-2.52-r1.ebuild
deleted file mode 100644
index 6be32d8e9c56..
--- a/games-engines/frotz/frotz-2.52-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Interpreter for Z-code based text games"
-HOMEPAGE="https://661.org/proj/if/frotz/;
-SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ncurses sdl sound unicode"
-REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
-
-DEPEND="
-   ncurses? (
-   sys-libs/ncurses:=[unicode(+)?]
-   sound? (
-   media-libs/libao
-   media-libs/libmodplug
-   media-libs/libsamplerate
-   media-libs/libsndfile[-minimal]
-   media-libs/libvorbis
-   )
-   )
-   sdl? (
-   media-libs/freetype:2
-   media-libs/libpng:0=
-   media-libs/libsdl2[sound,threads,video]
-   media-libs/sdl2-mixer[mod,vorbis,wav]
-   sys-libs/zlib
-   virtual/jpeg:0=
-   )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-   emake \
-   dumb \
-   $(use ncurses && echo ncurses) \
-   $(use sdl && echo sdl) \
-   AR="$(tc-getAR)" \
-   CC="$(tc-getCC)" \
-   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-   RANLIB="$(tc-getRANLIB)" \
-   CURSES=$(usex unicode ncursesw ncurses) \
-   USE_UTF8=$(usex unicode yes "") \
-   SOUND_TYPE=$(usex sound ao none) \
-   PREFIX="${EPREFIX}/usr" \
-   SYSCONFDIR="${EPREFIX}/etc"
-}
-
-src_install() {
-   emake \
-   install_dumb \
-   $(use ncurses && echo install) \
-   $(use sdl && echo install_sdl) \
-   PREFIX="${EPREFIX}/usr" \
-   DESTDIR="${D}"
-
-   dodoc \
-   AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
-   doc/frotz.conf-{big,small}
-}
-
-pkg_postinst() {
-   echo
-   elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
-   elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
-   echo
-}

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

2021-09-25 Thread Marek Szuba 
commit: 542690f525dc12f731f562ceb92ca77a1003f57a
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Sep 25 16:52:19 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Sep 25 18:39:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542690f5

games-engines/frotz: keyword 2.53-r1 for ~riscv

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

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

diff --git a/games-engines/frotz/frotz-2.53-r1.ebuild 
b/games-engines/frotz/frotz-2.53-r1.ebuild
index 6be32d8e9c5..1fdf97ae9e5 100644
--- a/games-engines/frotz/frotz-2.53-r1.ebuild
+++ b/games-engines/frotz/frotz-2.53-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="ncurses sdl sound unicode"
 REQUIRED_USE="sound? ( || ( ncurses sdl ) )"

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

2021-04-29 Thread Marek Szuba 
commit: a1703822ee4d05229a2fa4b115401001ce050dca
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Apr 29 11:37:21 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Apr 29 11:37:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1703822

games-engines/frotz: bump to 2.53

Trivial bump. Does not come with an automated test suite but having
manually run all the interactive tests provided in src/test/ using the
ncurses interface, everything seems to be in order.

Permission to commit in maintainers' stead granted by sam on Bugzilla.

Closes: https://bugs.gentoo.org/86576
Signed-off-by: Marek Szuba  gentoo.org>

 games-engines/frotz/Manifest  |  1 +
 games-engines/frotz/frotz-2.53.ebuild | 75 +++
 2 files changed, 76 insertions(+)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 393de8b60e3..6678f254461 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1 +1,2 @@
 DIST frotz-2.52.tar.bz2 289109 BLAKE2B 
d1e97e05d1da187846c64dacdf69f34a800be97b75121dc8de63c619687ed5ccbd6b03b2391d2896a14aaad1e4f8eb51926affb92a36f1a5bad8acec91524774
 SHA512 
387e7a7fe0cffd40b639a306eef89a22421a4ff4a8e5dbcf96a1ef3b901744b3f75a671953ecdc17bde0d699e4756d470b61c8213c47315baa2700da92d06710
+DIST frotz-2.53.tar.bz2 375800 BLAKE2B 
a3d14d11540cb12ed6e5326207946e26b0b3b85e13c50e7431f3901cfb19337661b233bf29077c1efe3a9663aef6d2886bba1717c8132d68e77580692fed30d1
 SHA512 
e920529920a0b831b859323046aeae032b4b84ac0296d4ef35026fe8a62798cf5f9f4e255af38421aa21ad5507cd87287924daafc759c9b9d7a089ba7d77d808

diff --git a/games-engines/frotz/frotz-2.53.ebuild 
b/games-engines/frotz/frotz-2.53.ebuild
new file mode 100644
index 000..f03a3d07028
--- /dev/null
+++ b/games-engines/frotz/frotz-2.53.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter for Z-code based text games"
+HOMEPAGE="https://661.org/proj/if/frotz/;
+SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ncurses sdl sound unicode"
+REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
+
+DEPEND="
+   ncurses? (
+   sys-libs/ncurses:0=[unicode?]
+   sound? (
+   media-libs/libao
+   media-libs/libmodplug
+   media-libs/libsamplerate
+   media-libs/libsndfile[-minimal]
+   media-libs/libvorbis
+   )
+   )
+   sdl? (
+   media-libs/freetype:2
+   media-libs/libpng:0=
+   media-libs/libsdl2[sound,threads,video]
+   media-libs/sdl2-mixer[mod,vorbis,wav]
+   sys-libs/zlib
+   virtual/jpeg:0=
+   )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+   emake \
+   dumb \
+   $(use ncurses && echo ncurses) \
+   $(use sdl && echo sdl) \
+   AR="$(tc-getAR)" \
+   CC="$(tc-getCC)" \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+   RANLIB="$(tc-getRANLIB)" \
+   CURSES=$(usex unicode ncursesw ncurses) \
+   USE_UTF8=$(usex unicode yes "") \
+   SOUND_TYPE=$(usex sound ao none) \
+   PREFIX="${EPREFIX}/usr" \
+   SYSCONFDIR="${EPREFIX}/etc"
+}
+
+src_install() {
+   emake \
+   install_dumb \
+   $(use ncurses && echo install) \
+   $(use sdl && echo install_sdl) \
+   PREFIX="${EPREFIX}/usr" \
+   DESTDIR="${D}"
+
+   dodoc \
+   AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
+   doc/frotz.conf-{big,small}
+}
+
+pkg_postinst() {
+   echo
+   elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
+   elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
+   echo
+}

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

2020-06-01 Thread Stefan Strogin 
commit: b5f8935a66cf42d0fd468dfab8b56d683a21ed85
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Mon Jun  1 17:33:20 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Jun  2 00:15:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f8935a

games-engines/frotz: remove old version

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Azamat H. Hackimov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16044
Signed-off-by: Stefan Strogin  gentoo.org>

 games-engines/frotz/Manifest |  1 -
 games-engines/frotz/files/dumb-ldflags.patch | 25 -
 games-engines/frotz/frotz-2.50_beta2.ebuild  | 84 
 3 files changed, 110 deletions(-)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 70924e87de1..393de8b60e3 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,2 +1 @@
-DIST frotz-2.50b2.tar.bz2 281065 BLAKE2B 
bffe35e9f77e7ef89b76bbe29a3f97ad94ac529bd4930790a25c147f336036b1bfdae1ea52cf87e62121189f4e1bce890f5bc3ddbfb0e68e9ffa290fc1567cc9
 SHA512 
12398c5bf963aaa7e1ad51a1ca3afaddf4849c2aed8e2cabffc411294b501181de69f99bad2a1c8de9777df4b448af6d85b695c56de4b3112cd32fd7d6cb33c7
 DIST frotz-2.52.tar.bz2 289109 BLAKE2B 
d1e97e05d1da187846c64dacdf69f34a800be97b75121dc8de63c619687ed5ccbd6b03b2391d2896a14aaad1e4f8eb51926affb92a36f1a5bad8acec91524774
 SHA512 
387e7a7fe0cffd40b639a306eef89a22421a4ff4a8e5dbcf96a1ef3b901744b3f75a671953ecdc17bde0d699e4756d470b61c8213c47315baa2700da92d06710

diff --git a/games-engines/frotz/files/dumb-ldflags.patch 
b/games-engines/frotz/files/dumb-ldflags.patch
deleted file mode 100644
index 2ac968b4b1d..000
--- a/games-engines/frotz/files/dumb-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4b4597d49dc024adf99a336d836709b876846128 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Sat, 26 Oct 2019 14:14:00 +0100
-Subject: [PATCH] Add missing LDFLAGS when linking dfrotz
-

- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 3c3c318..ed71a7d 100644
 a/Makefile
-+++ b/Makefile
-@@ -261,7 +261,7 @@ nosound_helper:
- 
- dumb: $(DFROTZ_BIN)
- $(DFROTZ_BIN): $(COMMON_LIB) $(DUMB_LIB) $(BLORB_LIB) $(COMMON_LIB)
--  $(CC) $+ -o $@$(EXTENSION)
-+  $(CC) $+ -o $@$(EXTENSION) $(LDFLAGS)
-   @echo "** Done building Frotz with dumb interface."
- 
- sdl: $(SFROTZ_BIN)
--- 
-2.23.0
-

diff --git a/games-engines/frotz/frotz-2.50_beta2.ebuild 
b/games-engines/frotz/frotz-2.50_beta2.ebuild
deleted file mode 100644
index 544ab8e09d6..000
--- a/games-engines/frotz/frotz-2.50_beta2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Interpreter for Z-code based text games"
-HOMEPAGE="https://661.org/proj/if/frotz/;
-SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ncurses sdl sound unicode"
-REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
-
-DEPEND="
-   ncurses? (
-   sys-libs/ncurses:0=[unicode?]
-   sound? (
-   media-libs/libao
-   media-libs/libmodplug
-   media-libs/libsamplerate[sndfile]
-   media-libs/libsndfile[-minimal]
-   media-libs/libvorbis
-   )
-   )
-   sdl? (
-   media-libs/freetype:2
-   media-libs/libpng:0=
-   media-libs/libsdl2[sound,threads,video]
-   media-libs/sdl2-mixer[mod,vorbis,wav]
-   sys-libs/zlib
-   virtual/jpeg:0=
-   )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}"/dumb-ldflags.patch
-)
-
-src_compile() {
-   emake \
-   dumb \
-   $(use ncurses && echo ncurses) \
-   $(use sdl && echo sdl) \
-   AR="$(tc-getAR)" \
-   CC="$(tc-getCC)" \
-   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-   RANLIB="$(tc-getRANLIB)" \
-   CURSES=$(usex unicode ncursesw ncurses) \
-   USE_UTF8=$(usex unicode yes "") \
-   SOUND=$(usex sound ao none) \
-   PREFIX="${EPREFIX}/usr" \
-   SYSCONFDIR="${EPREFIX}/etc"
-}
-
-src_install() {
-   emake \
-   install_dumb \
-   $(use ncurses && echo install) \
-   $(use sdl && echo install_sdl) \
-   PREFIX="${EPREFIX}/usr" \
-   DESTDIR="${D}"
-
-   dodoc \
-   AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
-   doc/frotz.conf-{big,small}
-}
-
-pkg_postinst() {
-

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

2020-06-01 Thread Stefan Strogin 
commit: 79948e7dfc595460081be7ff64f9c769b2e31c12
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Mon Jun  1 17:32:45 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Jun  2 00:15:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79948e7d

games-engines/frotz: update to 2.52

New version can be compiled with GCC 10 (#707608).

Closes: https://bugs.gentoo.org/707608
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Azamat H. Hackimov  gmail.com>
Signed-off-by: Stefan Strogin  gentoo.org>

 games-engines/frotz/Manifest  |  1 +
 games-engines/frotz/frotz-2.52.ebuild | 75 +++
 2 files changed, 76 insertions(+)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index af3e74b6b95..70924e87de1 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1 +1,2 @@
 DIST frotz-2.50b2.tar.bz2 281065 BLAKE2B 
bffe35e9f77e7ef89b76bbe29a3f97ad94ac529bd4930790a25c147f336036b1bfdae1ea52cf87e62121189f4e1bce890f5bc3ddbfb0e68e9ffa290fc1567cc9
 SHA512 
12398c5bf963aaa7e1ad51a1ca3afaddf4849c2aed8e2cabffc411294b501181de69f99bad2a1c8de9777df4b448af6d85b695c56de4b3112cd32fd7d6cb33c7
+DIST frotz-2.52.tar.bz2 289109 BLAKE2B 
d1e97e05d1da187846c64dacdf69f34a800be97b75121dc8de63c619687ed5ccbd6b03b2391d2896a14aaad1e4f8eb51926affb92a36f1a5bad8acec91524774
 SHA512 
387e7a7fe0cffd40b639a306eef89a22421a4ff4a8e5dbcf96a1ef3b901744b3f75a671953ecdc17bde0d699e4756d470b61c8213c47315baa2700da92d06710

diff --git a/games-engines/frotz/frotz-2.52.ebuild 
b/games-engines/frotz/frotz-2.52.ebuild
new file mode 100644
index 000..cab60c1ec29
--- /dev/null
+++ b/games-engines/frotz/frotz-2.52.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter for Z-code based text games"
+HOMEPAGE="https://661.org/proj/if/frotz/;
+SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${PV}/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ncurses sdl sound unicode"
+REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
+
+DEPEND="
+   ncurses? (
+   sys-libs/ncurses:0=[unicode?]
+   sound? (
+   media-libs/libao
+   media-libs/libmodplug
+   media-libs/libsamplerate
+   media-libs/libsndfile[-minimal]
+   media-libs/libvorbis
+   )
+   )
+   sdl? (
+   media-libs/freetype:2
+   media-libs/libpng:0=
+   media-libs/libsdl2[sound,threads,video]
+   media-libs/sdl2-mixer[mod,vorbis,wav]
+   sys-libs/zlib
+   virtual/jpeg:0=
+   )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+   emake \
+   dumb \
+   $(use ncurses && echo ncurses) \
+   $(use sdl && echo sdl) \
+   AR="$(tc-getAR)" \
+   CC="$(tc-getCC)" \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+   RANLIB="$(tc-getRANLIB)" \
+   CURSES=$(usex unicode ncursesw ncurses) \
+   USE_UTF8=$(usex unicode yes "") \
+   SOUND_TYPE=$(usex sound ao none) \
+   PREFIX="${EPREFIX}/usr" \
+   SYSCONFDIR="${EPREFIX}/etc"
+}
+
+src_install() {
+   emake \
+   install_dumb \
+   $(use ncurses && echo install) \
+   $(use sdl && echo install_sdl) \
+   PREFIX="${EPREFIX}/usr" \
+   DESTDIR="${D}"
+
+   dodoc \
+   AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
+   doc/frotz.conf-{big,small}
+}
+
+pkg_postinst() {
+   echo
+   elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
+   elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
+   echo
+}

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

2019-10-26 Thread James Le Cuirot 
commit: 9fe6828d9182e8195b9a97f16c7f8377ccf96b7f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Oct 26 13:28:41 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct 26 13:28:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe6828d

games-engines/frotz: Drop old 2.45_pre20190903

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

 games-engines/frotz/Manifest  |  1 -
 games-engines/frotz/frotz-2.45_pre20190903.ebuild | 74 ---
 2 files changed, 75 deletions(-)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 39ea08a7fb1..af3e74b6b95 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,2 +1 @@
 DIST frotz-2.50b2.tar.bz2 281065 BLAKE2B 
bffe35e9f77e7ef89b76bbe29a3f97ad94ac529bd4930790a25c147f336036b1bfdae1ea52cf87e62121189f4e1bce890f5bc3ddbfb0e68e9ffa290fc1567cc9
 SHA512 
12398c5bf963aaa7e1ad51a1ca3afaddf4849c2aed8e2cabffc411294b501181de69f99bad2a1c8de9777df4b448af6d85b695c56de4b3112cd32fd7d6cb33c7
-DIST frotz-57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9.tar.bz2 281258 BLAKE2B 
d85a53157e539bb1e79aade97726b5b6f752d7799faea0f35063c3321c97ddbadf7bb9318533badb212b49b397c52e3fd458d5d08868d90b564002de3ffe4324
 SHA512 
45fc40f4eebb338e4e4cba8ef446726a9126d45b6646ffcf3a2679dfde5630500e492667363c63f7806630d4b8d88a225080c0a2696c4170d86b1cf4d8b0a06c

diff --git a/games-engines/frotz/frotz-2.45_pre20190903.ebuild 
b/games-engines/frotz/frotz-2.45_pre20190903.ebuild
deleted file mode 100644
index f2a3485e522..000
--- a/games-engines/frotz/frotz-2.45_pre20190903.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Interpreter for Z-code based text games"
-HOMEPAGE="https://661.org/proj/if/frotz/;
-SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ncurses sdl sound unicode"
-REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
-
-DEPEND="
-   ncurses? (
-   sys-libs/ncurses:0=[unicode?]
-   sound? ( media-libs/libao )
-   )
-   sdl? (
-   media-libs/freetype:2
-   media-libs/libpng:0=
-   media-libs/libsdl2[sound,threads,video]
-   media-libs/sdl2-mixer
-   sys-libs/zlib
-   virtual/jpeg:0=
-   )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-   emake \
-   dumb \
-   $(use ncurses && echo ncurses) \
-   $(use sdl && echo sdl) \
-   AR="$(tc-getAR)" \
-   CC="$(tc-getCC)" \
-   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-   RANLIB="$(tc-getRANLIB)" \
-   CURSES=$(usex unicode ncursesw ncurses) \
-   USE_UTF8=$(usex unicode yes "") \
-   SOUND=$(usex sound ao none) \
-   PREFIX="${EPREFIX}/usr" \
-   SYSCONFDIR="${EPREFIX}/etc"
-}
-
-src_install () {
-   emake \
-   install_dumb \
-   $(use ncurses && echo install) \
-   $(use sdl && echo install_sdl) \
-   PREFIX="${EPREFIX}/usr" \
-   DESTDIR="${D}"
-
-   dodoc \
-   AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
-   doc/frotz.conf-{big,small}
-}
-
-pkg_postinst() {
-   echo
-   elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
-   elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
-   echo
-}

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

2019-10-26 Thread James Le Cuirot 
commit: 6b6198cf83601088066cac51751ba046820236c3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Oct 26 13:26:28 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct 26 13:26:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6198cf

games-engines/frotz: Add missing sound dependencies

libvorbis isn't actually used directly, apart from in the Makefile,
where it's included in the link, presumably for static
linking. Support in libsndfile or libsdl2 is expected to be present
though so I have included it anyway.

I haven't included minimum versions as stated in INSTALL because it
admits that older versions may work and we generally don't bother
unless older versions are still in the tree or were until recently.

Closes: https://bugs.gentoo.org/698434
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/frotz/frotz-2.50_beta2.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/games-engines/frotz/frotz-2.50_beta2.ebuild 
b/games-engines/frotz/frotz-2.50_beta2.ebuild
index dda1c12531b..732495e1c96 100644
--- a/games-engines/frotz/frotz-2.50_beta2.ebuild
+++ b/games-engines/frotz/frotz-2.50_beta2.ebuild
@@ -20,13 +20,19 @@ REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
 DEPEND="
ncurses? (
sys-libs/ncurses:0=[unicode?]
-   sound? ( media-libs/libao )
+   sound? (
+   media-libs/libao
+   media-libs/libmodplug
+   media-libs/libsamplerate[sndfile]
+   media-libs/libsndfile[-minimal]
+   media-libs/libvorbis
+   )
)
sdl? (
media-libs/freetype:2
media-libs/libpng:0=
media-libs/libsdl2[sound,threads,video]
-   media-libs/sdl2-mixer
+   media-libs/sdl2-mixer[mod,vorbis,wav]
sys-libs/zlib
virtual/jpeg:0=
)

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

2019-10-26 Thread James Le Cuirot 
commit: f97da5dcc59554a2322cc7328438928f5d20e00a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Oct 26 13:21:30 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct 26 13:21:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97da5dc

games-engines/frotz: Version bump to 2.50_beta2

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

 games-engines/frotz/Manifest |  1 +
 games-engines/frotz/files/dumb-ldflags.patch | 25 +
 games-engines/frotz/frotz-2.50_beta2.ebuild  | 78 
 3 files changed, 104 insertions(+)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 8ffeb0250c3..39ea08a7fb1 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1 +1,2 @@
+DIST frotz-2.50b2.tar.bz2 281065 BLAKE2B 
bffe35e9f77e7ef89b76bbe29a3f97ad94ac529bd4930790a25c147f336036b1bfdae1ea52cf87e62121189f4e1bce890f5bc3ddbfb0e68e9ffa290fc1567cc9
 SHA512 
12398c5bf963aaa7e1ad51a1ca3afaddf4849c2aed8e2cabffc411294b501181de69f99bad2a1c8de9777df4b448af6d85b695c56de4b3112cd32fd7d6cb33c7
 DIST frotz-57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9.tar.bz2 281258 BLAKE2B 
d85a53157e539bb1e79aade97726b5b6f752d7799faea0f35063c3321c97ddbadf7bb9318533badb212b49b397c52e3fd458d5d08868d90b564002de3ffe4324
 SHA512 
45fc40f4eebb338e4e4cba8ef446726a9126d45b6646ffcf3a2679dfde5630500e492667363c63f7806630d4b8d88a225080c0a2696c4170d86b1cf4d8b0a06c

diff --git a/games-engines/frotz/files/dumb-ldflags.patch 
b/games-engines/frotz/files/dumb-ldflags.patch
new file mode 100644
index 000..2ac968b4b1d
--- /dev/null
+++ b/games-engines/frotz/files/dumb-ldflags.patch
@@ -0,0 +1,25 @@
+From 4b4597d49dc024adf99a336d836709b876846128 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot 
+Date: Sat, 26 Oct 2019 14:14:00 +0100
+Subject: [PATCH] Add missing LDFLAGS when linking dfrotz
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 3c3c318..ed71a7d 100644
+--- a/Makefile
 b/Makefile
+@@ -261,7 +261,7 @@ nosound_helper:
+ 
+ dumb: $(DFROTZ_BIN)
+ $(DFROTZ_BIN): $(COMMON_LIB) $(DUMB_LIB) $(BLORB_LIB) $(COMMON_LIB)
+-  $(CC) $+ -o $@$(EXTENSION)
++  $(CC) $+ -o $@$(EXTENSION) $(LDFLAGS)
+   @echo "** Done building Frotz with dumb interface."
+ 
+ sdl: $(SFROTZ_BIN)
+-- 
+2.23.0
+

diff --git a/games-engines/frotz/frotz-2.50_beta2.ebuild 
b/games-engines/frotz/frotz-2.50_beta2.ebuild
new file mode 100644
index 000..dda1c12531b
--- /dev/null
+++ b/games-engines/frotz/frotz-2.50_beta2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Interpreter for Z-code based text games"
+HOMEPAGE="https://661.org/proj/if/frotz/;
+SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ncurses sdl sound unicode"
+REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
+
+DEPEND="
+   ncurses? (
+   sys-libs/ncurses:0=[unicode?]
+   sound? ( media-libs/libao )
+   )
+   sdl? (
+   media-libs/freetype:2
+   media-libs/libpng:0=
+   media-libs/libsdl2[sound,threads,video]
+   media-libs/sdl2-mixer
+   sys-libs/zlib
+   virtual/jpeg:0=
+   )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/dumb-ldflags.patch
+)
+
+src_compile() {
+   emake \
+   dumb \
+   $(use ncurses && echo ncurses) \
+   $(use sdl && echo sdl) \
+   AR="$(tc-getAR)" \
+   CC="$(tc-getCC)" \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+   RANLIB="$(tc-getRANLIB)" \
+   CURSES=$(usex unicode ncursesw ncurses) \
+   USE_UTF8=$(usex unicode yes "") \
+   SOUND=$(usex sound ao none) \
+   PREFIX="${EPREFIX}/usr" \
+   SYSCONFDIR="${EPREFIX}/etc"
+}
+
+src_install () {
+   emake \
+   install_dumb \
+   $(use ncurses && echo install) \
+   $(use sdl && echo install_sdl) \
+   PREFIX="${EPREFIX}/usr" \
+   DESTDIR="${D}"
+
+   dodoc \
+   AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
+   doc/frotz.conf-{big,small}
+}
+
+pkg_postinst() {
+   echo
+   elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
+   elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
+   echo
+}

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

2019-09-03 Thread James Le Cuirot 
commit: 96cd29c93318afa743475a047d2a062952ea0afd
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Sep  3 22:10:33 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep  3 22:30:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96cd29c9

games-engines/frotz: Version bump to 2.45_pre20190903, many fixes

Not an actual release but much easier to build than the last one. Also
uses SDL2 rather than SDL1. Many thanks to upstream for merging all my
patches so quickly.

Fixes ncurses, prefix, cross-compiling, and probably more I forget.

Bug: https://bugs.gentoo.org/68
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/frotz/Manifest  |  1 +
 games-engines/frotz/frotz-2.45_pre20190903.ebuild | 74 +++
 games-engines/frotz/metadata.xml  |  2 +-
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 479656678cb..2109b341c5b 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1 +1,2 @@
 DIST frotz-2.43.tar.gz 160771 BLAKE2B 
edee48050b247320df3d02ea4682579d4f933a5853cc9a31f56c4d12596d5e5657e79e176ed1725e72028497a843db1d0b13833ffe44e41ec7f532f0d40ccaf9
 SHA512 
654f2ca2d1a625df8f88b5629e09a873668cea42688acdf154636b066b94fc9d70b7f45acb33a71d234c19b59c394c63aee38d6224245b3b329210e6b4a58409
+DIST frotz-57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9.tar.bz2 281258 BLAKE2B 
d85a53157e539bb1e79aade97726b5b6f752d7799faea0f35063c3321c97ddbadf7bb9318533badb212b49b397c52e3fd458d5d08868d90b564002de3ffe4324
 SHA512 
45fc40f4eebb338e4e4cba8ef446726a9126d45b6646ffcf3a2679dfde5630500e492667363c63f7806630d4b8d88a225080c0a2696c4170d86b1cf4d8b0a06c

diff --git a/games-engines/frotz/frotz-2.45_pre20190903.ebuild 
b/games-engines/frotz/frotz-2.45_pre20190903.ebuild
new file mode 100644
index 000..f2a3485e522
--- /dev/null
+++ b/games-engines/frotz/frotz-2.45_pre20190903.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Interpreter for Z-code based text games"
+HOMEPAGE="https://661.org/proj/if/frotz/;
+SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ncurses sdl sound unicode"
+REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
+
+DEPEND="
+   ncurses? (
+   sys-libs/ncurses:0=[unicode?]
+   sound? ( media-libs/libao )
+   )
+   sdl? (
+   media-libs/freetype:2
+   media-libs/libpng:0=
+   media-libs/libsdl2[sound,threads,video]
+   media-libs/sdl2-mixer
+   sys-libs/zlib
+   virtual/jpeg:0=
+   )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+   emake \
+   dumb \
+   $(use ncurses && echo ncurses) \
+   $(use sdl && echo sdl) \
+   AR="$(tc-getAR)" \
+   CC="$(tc-getCC)" \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+   RANLIB="$(tc-getRANLIB)" \
+   CURSES=$(usex unicode ncursesw ncurses) \
+   USE_UTF8=$(usex unicode yes "") \
+   SOUND=$(usex sound ao none) \
+   PREFIX="${EPREFIX}/usr" \
+   SYSCONFDIR="${EPREFIX}/etc"
+}
+
+src_install () {
+   emake \
+   install_dumb \
+   $(use ncurses && echo install) \
+   $(use sdl && echo install_sdl) \
+   PREFIX="${EPREFIX}/usr" \
+   DESTDIR="${D}"
+
+   dodoc \
+   AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
+   doc/frotz.conf-{big,small}
+}
+
+pkg_postinst() {
+   echo
+   elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
+   elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
+   echo
+}

diff --git a/games-engines/frotz/metadata.xml b/games-engines/frotz/metadata.xml
index 051541926fb..455473e4c7c 100644
--- a/games-engines/frotz/metadata.xml
+++ b/games-engines/frotz/metadata.xml
@@ -6,6 +6,6 @@
Gentoo Games Project


-   frotz
+   DavidGriffith/frotz

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

2019-09-03 Thread James Le Cuirot 
commit: 99b274ce3fed3473103a1811909a4a521034590f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Sep  3 22:12:01 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep  3 22:30:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b274ce

games-engines/frotz: Drop old 2.43-r1

Closes: https://bugs.gentoo.org/68
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/frotz/Manifest   |  1 -
 .../frotz/files/frotz-2.43-glibc2.10.patch | 29 
 games-engines/frotz/files/frotz-2.43-ldflags.patch | 20 -
 games-engines/frotz/frotz-2.43-r1.ebuild   | 52 --
 4 files changed, 102 deletions(-)

diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 2109b341c5b..8ffeb0250c3 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,2 +1 @@
-DIST frotz-2.43.tar.gz 160771 BLAKE2B 
edee48050b247320df3d02ea4682579d4f933a5853cc9a31f56c4d12596d5e5657e79e176ed1725e72028497a843db1d0b13833ffe44e41ec7f532f0d40ccaf9
 SHA512 
654f2ca2d1a625df8f88b5629e09a873668cea42688acdf154636b066b94fc9d70b7f45acb33a71d234c19b59c394c63aee38d6224245b3b329210e6b4a58409
 DIST frotz-57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9.tar.bz2 281258 BLAKE2B 
d85a53157e539bb1e79aade97726b5b6f752d7799faea0f35063c3321c97ddbadf7bb9318533badb212b49b397c52e3fd458d5d08868d90b564002de3ffe4324
 SHA512 
45fc40f4eebb338e4e4cba8ef446726a9126d45b6646ffcf3a2679dfde5630500e492667363c63f7806630d4b8d88a225080c0a2696c4170d86b1cf4d8b0a06c

diff --git a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch 
b/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
deleted file mode 100644
index 3f2639ec47d..000
--- a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
 a/src/dumb/dumb_input.c
-+++ b/src/dumb/dumb_input.c
-@@ -79,7 +79,7 @@
- /* Read one line, including the newline, into s.  Safely avoids buffer
-  * overruns (but that's kind of pointless because there are several
-  * other places where I'm not so careful).  */
--static void getline(char *s)
-+static void get_line(char *s)
- {
-   int c;
-   char *p = s;
-@@ -203,7 +203,7 @@
-   fputs(prompt, stdout);
- else
-   dumb_show_prompt(show_cursor, (timeout ? "tTD" : ")>}")[type]);
--getline(s);
-+get_line(s);
- if ((s[0] != '\\') || ((s[1] != '\0') && !islower(s[1]))) {
-   /* Is not a command line.  */
-   translate_special_chars(s);
-@@ -265,7 +265,7 @@
- if (!*current_page)
-   break;
- printf("HELP: Type  for more, or q  to stop: ");
--getline(s);
-+get_line(s);
- if (!strcmp(s, "q\n"))
-   break;
-   }

diff --git a/games-engines/frotz/files/frotz-2.43-ldflags.patch 
b/games-engines/frotz/files/frotz-2.43-ldflags.patch
deleted file mode 100644
index c8b4e35eee2..000
--- a/games-engines/frotz/files/frotz-2.43-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/Makefile 2010-10-04 14:13:37.0 +0200
-+++ b/Makefile 2010-10-04 14:14:06.0 +0200
-@@ -162,7 +162,7 @@
- $(NAME): $(NAME)-curses
- 
- $(NAME)-curses:   soundcard.h  $(COMMON_TARGET) $(CURSES_TARGET)
--  $(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
-+  $(CC) $(LDFLAGS) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
-   $(SOUND_LIB)
- 
- all:  $(NAME) d$(NAME)
-@@ -170,7 +170,7 @@
- dumb: $(NAME)-dumb
- d$(NAME): $(NAME)-dumb
- $(NAME)-dumb: $(COMMON_TARGET) $(DUMB_TARGET)
--  $(CC) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \
-+  $(CC) $(LDFLAGS) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \
-   $(DUMB_TARGET) $(LIB)
- 
- .SUFFIXES:

diff --git a/games-engines/frotz/frotz-2.43-r1.ebuild 
b/games-engines/frotz/frotz-2.43-r1.ebuild
deleted file mode 100644
index 08d19d78526..000
--- a/games-engines/frotz/frotz-2.43-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Curses based interpreter for Z-code based text games"
-HOMEPAGE="http://frotz.sourceforge.net/;
-SRC_URI="http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa oss"
-
-DEPEND="sys-libs/ncurses:0
-   alsa? ( oss? ( media-libs/alsa-oss ) )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-glibc2.10.patch
-   "${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e '/^CC /d' \
-   Makefile \
-   || die
-}
-
-src_compile() {
-   local OPTS="CONFIG_DIR=/etc"
-   use oss && OPTS="${OPTS} SOUND_DEFS=-DOSS_SOUND SOUND_DEV=/dev/dsp"
-   emake ${OPTS} all
-}
-
-src_install () {
-

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

2016-11-11 Thread Austin English 
commit: d12b75fa62a5f5230c4624cf142b845ccedfa66d
Author: Austin English  gentoo  org>
AuthorDate: Wed Nov  2 22:04:46 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Fri Nov 11 19:38:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12b75fa

games-engines/frotz: remove deprecated games eclass

Also update to EAPI 6

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

Package-Manager: portage-2.3.2

 .../frotz/files/frotz-2.43-glibc2.10.patch |  4 +-
 games-engines/frotz/files/frotz-2.43-ldflags.patch |  4 +-
 games-engines/frotz/frotz-2.43-r1.ebuild   | 53 ++
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch 
b/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
index 71760cc..3f2639e 100644
--- a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
+++ b/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
@@ -1,5 +1,5 @@
 src/dumb/dumb_input.c
-+++ src/dumb/dumb_input.c
+--- a/src/dumb/dumb_input.c
 b/src/dumb/dumb_input.c
 @@ -79,7 +79,7 @@
  /* Read one line, including the newline, into s.  Safely avoids buffer
   * overruns (but that's kind of pointless because there are several

diff --git a/games-engines/frotz/files/frotz-2.43-ldflags.patch 
b/games-engines/frotz/files/frotz-2.43-ldflags.patch
index 16a0df3..c8b4e35 100644
--- a/games-engines/frotz/files/frotz-2.43-ldflags.patch
+++ b/games-engines/frotz/files/frotz-2.43-ldflags.patch
@@ -1,5 +1,5 @@
 Makefile.old   2010-10-04 14:13:37.0 +0200
-+++ Makefile   2010-10-04 14:14:06.0 +0200
+--- a/Makefile 2010-10-04 14:13:37.0 +0200
 b/Makefile 2010-10-04 14:14:06.0 +0200
 @@ -162,7 +162,7 @@
  $(NAME): $(NAME)-curses
  

diff --git a/games-engines/frotz/frotz-2.43-r1.ebuild 
b/games-engines/frotz/frotz-2.43-r1.ebuild
new file mode 100644
index ..c805a54
--- /dev/null
+++ b/games-engines/frotz/frotz-2.43-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Curses based interpreter for Z-code based text games"
+HOMEPAGE="http://frotz.sourceforge.net/;
+SRC_URI="http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="alsa oss"
+
+DEPEND="sys-libs/ncurses:0
+   alsa? ( oss? ( media-libs/alsa-oss ) )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-glibc2.10.patch
+   "${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/^CC /d' \
+   Makefile \
+   || die
+}
+
+src_compile() {
+   local OPTS="CONFIG_DIR=/etc"
+   use oss && OPTS="${OPTS} SOUND_DEFS=-DOSS_SOUND SOUND_DEV=/dev/dsp"
+   emake ${OPTS} all
+}
+
+src_install () {
+   dobin {d,}frotz
+   doman doc/*.6
+   dodoc AUTHORS BUGS ChangeLog HOW_TO_PLAY README TODO \
+   doc/{frotz.conf-big,frotz.conf-small}
+}
+
+pkg_postinst() {
+   echo
+   elog "Global config file can be installed in /etc/frotz.conf"
+   elog "Sample config files are in /usr/share/doc/${PF}"
+   echo
+}