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

[James Le Cuirot]

commit:     99b274ce3fed3473103a1811909a4a521034590f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 22:12:01 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 22:30:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b274ce

games-engines/frotz: Drop old 2.43-r1

Closes: https://bugs.gentoo.org/677778
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> 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..00000000000
--- 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 <return> for more, or q <return> 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..00000000000
--- a/games-engines/frotz/files/frotz-2.43-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile	2010-10-04 14:13:37.000000000 +0200
-+++ b/Makefile	2010-10-04 14:14:06.000000000 +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..00000000000
--- 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 () {
-	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
-}