EAPI=5; tidy; clean old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 21 insertions, 143 deletions

diff --git a/games-mud/tf/ChangeLog b/games-mud/tf/ChangeLog
index 298cbfb51cd5..b145be65b427 100644
--- a/games-mud/tf/ChangeLog
+++ b/games-mud/tf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-mud/tf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.28 2013/09/16 21:34:10 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.29 2014/09/06 05:35:23 mr_bones_ Exp $
+
+  06 Sep 2014; Michael Sterrett <mr_bones_@gentoo.org> -files/tf-40-gcc4.patch,
+  -files/tf-40-gentoo.diff, -tf-40-r2.ebuild, tf-50_beta8-r1.ebuild:
+  EAPI=5; tidy; clean old
 
   16 Sep 2013; Michael Sterrett <mr_bones_@gentoo.org>
   +files/tf-50_beta8-stdarg.patch, tf-50_beta8-r1.ebuild:
diff --git a/games-mud/tf/files/tf-40-gcc4.patch b/games-mud/tf/files/tf-40-gcc4.patch
deleted file mode 100644
index 2b96ac03bdd0..000000000000
--- a/games-mud/tf/files/tf-40-gcc4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -urpN tf-40s1.orig/src/history.c tf-40s1/src/history.c
---- tf-40s1.orig/src/history.c	1999-03-06 23:43:24.000000000 +0100
-+++ tf-40s1/src/history.c	2006-09-30 18:16:43.000000000 +0200
-@@ -38,18 +38,6 @@
- #define LOCALSIZE      100	/* local history size */
- #define INPUTSIZE      100	/* command history buffer size */
- 
--typedef struct History {	/* circular list of Alines, and logfile */
--    struct Aline **alines;
--    int size;			/* actual number of lines currently saved */
--    int maxsize;		/* maximum number of lines that can be saved */
--    int first;			/* position of first line in circular array */
--    int last;			/* position of last line in circular array */
--    int index;			/* current recall position */
--    int total;			/* total number of lines ever saved */
--    TFILE *logfile;
--    CONST char *logname;
--} History;
--
- #define empty(hist) (!(hist)->alines || !(hist)->size)
- 
- static void     FDECL(alloc_history,(History *hist, int maxsize));
-diff -urpN tf-40s1.orig/src/history.h tf-40s1/src/history.h
---- tf-40s1.orig/src/history.h	1999-03-06 23:43:24.000000000 +0100
-+++ tf-40s1/src/history.h	2006-09-30 18:16:39.000000000 +0200
-@@ -31,6 +31,18 @@ extern void   NDECL(free_histories);
- #define record_global(aline)  recordline(globalhist, (aline))
- #define record_local(aline)   recordline(localhist, (aline))
- 
-+typedef struct History {	/* circular list of Alines, and logfile */
-+    struct Aline **alines;
-+    int size;			/* actual number of lines currently saved */
-+    int maxsize;		/* maximum number of lines that can be saved */
-+    int first;			/* position of first line in circular array */
-+    int last;			/* position of last line in circular array */
-+    int index;			/* current recall position */
-+    int total;			/* total number of lines ever saved */
-+    TFILE *logfile;
-+    CONST char *logname;
-+} History;
-+
- extern struct History globalhist[], localhist[];
- extern int log_count, norecord, nolog;
- 
diff --git a/games-mud/tf/files/tf-40-gentoo.diff b/games-mud/tf/files/tf-40-gentoo.diff
deleted file mode 100644
index e980f9d1c202..000000000000
--- a/games-mud/tf/files/tf-40-gentoo.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- unix/Config.orig	2006-10-01 00:13:05.000000000 -0400
-+++ unix/Config	2006-10-01 00:14:11.000000000 -0400
-@@ -33,9 +33,9 @@
- #   even if an old version is currently in use.  You can remove
- #   the old version manually later when it is no longer in use.
- 
--# TF="/usr/local/bin/tf-${TFVER}"
--# LIBDIR="/usr/local/lib/tf-${TFVER}-lib"
--# SYMLINK="/usr/local/bin/tf"
-+TF="/usr/bin/tf-${TFVER}"
-+LIBDIR="/usr/lib/tf-${TFVER}-lib"
-+SYMLINK="/usr/bin/tf"
- 
- 
- ### Manual Page.
-@@ -44,8 +44,8 @@
- # uses nroff format; set MANTYPE=cat if your man uses pre-formatted
- # vt100 "catman" pages.  Default is "cat".
- 
--# MANTYPE="nroff"
--# MANPAGE="/usr/local/man/man1/tf.1"
-+#MANTYPE="nroff"
-+MANPAGE="/usr/share/man/man1/tf.1"
- 
- 
- ### Flags.
-@@ -109,7 +109,7 @@
- # If unixmake told you to set CC=cc, be sure to uncomment the line below
- # by removing the leading "#".
- 
--# CC=cc
-+CC=gcc
- # CCFLAGS="-g"
- 
- 
-@@ -117,7 +117,7 @@
- # tfconfig will use "strip" on the tf binary unless you tell it otherwise.
- # Set STRIP='' to disable stripping.
- 
--# STRIP=''
-+STRIP=''
- 
- 
- ### Other Compiler Libraries.
diff --git a/games-mud/tf/tf-40-r2.ebuild b/games-mud/tf/tf-40-r2.ebuild
deleted file mode 100644
index 137e0d8320f9..000000000000
--- a/games-mud/tf/tf-40-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-40-r2.ebuild,v 1.11 2008/07/18 16:15:32 mr_bones_ Exp $
-
-inherit eutils
-
-MY_P=${P}s1
-DESCRIPTION="A small, flexible, screen-oriented MUD client (aka TinyFugue)"
-HOMEPAGE="http://tf.tcp.com/~hawkeye/tf/"
-SRC_URI="mirror://tinyfugue/${MY_P}.tar.gz
-	doc? ( mirror://tinyfugue/${MY_P}-help.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" ~amd64 ~sparc x86"
-IUSE="doc"
-
-DEPEND=">=sys-libs/ncurses-5.2"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch \
-		"${FILESDIR}/${P}-gentoo.diff" \
-		"${FILESDIR}/${P}-gcc4.patch"
-}
-
-src_compile() {
-	echo 'y' | ./unixmake config || die
-	./unixmake all || die
-}
-
-src_install() {
-	dobin src/tf || die
-	newman src/tf.1.catman tf.1
-	exeinto /usr/lib/${MY_P}-lib
-	doexe tf-lib/*
-	insinto /usr/lib/${MY_P}-lib
-	doins CHANGES
-	dodoc CHANGES CREDITS README
-	use doc && dohtml -r "${WORKDIR}"/${MY_P}-help
-}
diff --git a/games-mud/tf/tf-50_beta8-r1.ebuild b/games-mud/tf/tf-50_beta8-r1.ebuild
index b428a7c2b4ad..b8a3f6695661 100644
--- a/games-mud/tf/tf-50_beta8-r1.ebuild
+++ b/games-mud/tf/tf-50_beta8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.6 2013/09/16 21:34:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.7 2014/09/06 05:35:23 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit games
 
 MY_P="${P/_beta/b}"
@@ -22,11 +22,17 @@ IUSE="+atcp debug doc +gmcp ipv6 +option102 ssl"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	dev-libs/libpcre"
-DEPEND="${RDEPEND}"
+DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${DISTDIR}"/tf-all*patch.txt "${FILESDIR}"/${P}-pcre.patch "${FILESDIR}"/${P}-stdarg.patch )
+
+src_prepare() {
+	epatch \
+		"${DISTDIR}"/tf-all*patch.txt \
+		"${FILESDIR}"/${P}-pcre.patch \
+		"${FILESDIR}"/${P}-stdarg.patch
+}
 
 src_configure() {
 	STRIP=: egamesconf \
@@ -36,20 +42,20 @@ src_configure() {
 		$(use_enable ssl) \
 		$(use_enable debug core) \
 		$(use_enable ipv6 inet6) \
-		--enable-manpage || die
+		--enable-manpage
 }
 
 src_install() {
-	dogamesbin src/tf || die
+	dogamesbin src/tf
 	newman src/tf.1.nroffman tf.1
 	dodoc CHANGES CREDITS README
 
 	insinto "${GAMES_DATADIR}"/${PN}-lib
 	# the application looks for this file here if /changes is called.
 	# see comments on bug #23274
-	doins CHANGES || die
+	doins CHANGES
 	insopts -m0755
-	doins tf-lib/* || die
+	doins tf-lib/*
 	if use doc ; then
 		cd ../${MY_P}-help
 		dohtml -r *.html commands topics