Set CFLAGS to override the Makefile instead of sedding it in, respecting LDFLAGS (bug #337895) too. Add patch to fix (some) compiler warnings. Use tc-getCC instead of tc-export. Remove empty DEPEND.

(Portage version: 2.2_rc98/cvs/Linux i686)

3 files changed, 86 insertions, 1 deletions

diff --git a/app-misc/figlet/ChangeLog b/app-misc/figlet/ChangeLog
index 8d41f33bd17b..588a8326b74d 100644
--- a/app-misc/figlet/ChangeLog
+++ b/app-misc/figlet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/figlet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/ChangeLog,v 1.36 2010/10/19 06:07:45 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/ChangeLog,v 1.37 2010/10/20 04:56:27 jer Exp $
+
+*figlet-222-r1 (20 Oct 2010)
+
+  20 Oct 2010; Jeroen Roovers <jer@gentoo.org> +figlet-222-r1.ebuild,
+  +files/figlet-222-includes.diff:
+  Set CFLAGS to override the Makefile instead of sedding it in, respecting
+  LDFLAGS (bug #337895) too. Add patch to fix (some) compiler warnings. Use
+  tc-getCC instead of tc-export. Remove empty DEPEND.
 
   19 Oct 2010; Mart Raudsepp <leio@gentoo.org> figlet-222.ebuild:
   Drop to ~mips
diff --git a/app-misc/figlet/figlet-222-r1.ebuild b/app-misc/figlet/figlet-222-r1.ebuild
new file mode 100644
index 000000000000..5a3c5ae8718b
--- /dev/null
+++ b/app-misc/figlet/figlet-222-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/figlet-222-r1.ebuild,v 1.1 2010/10/20 04:56:27 jer Exp $
+
+EAPI="2"
+
+inherit eutils bash-completion toolchain-funcs
+
+MY_P=${P/-/}
+DESCRIPTION="program for making large letters out of ordinary text"
+HOMEPAGE="http://www.figlet.org/"
+# Bug 35339 - add more fonts to figlet ebuild
+# The fonts are available from the figlet site, but they don't
+# have versions so we mirror them ourselves.
+SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${MY_P}.tar.gz
+	mirror://gentoo/contributed-${PN}-221.tar.gz
+	mirror://gentoo/ms-dos-${PN}-221.tar.gz"
+
+LICENSE="AFL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cp "${WORKDIR}"/contributed/C64-fonts/*.flf fonts/ || die
+	cp "${WORKDIR}"/contributed/bdffonts/*.flf fonts/ || die
+	cp "${WORKDIR}"/ms-dos/*.flf fonts/ || die
+	cp "${WORKDIR}"/contributed/*.flf fonts/ || die
+
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.diff \
+		"${FILESDIR}"/${P}-includes.diff
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${LDFLAGS}" \
+		clean all \
+		|| die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man6 || die "dodir failed"
+	chmod +x figlist showfigfonts
+	use prefix || ED="${D}"
+	emake \
+		DESTDIR="${ED}"/usr/bin \
+		MANDIR="${ED}"/usr/share/man/man6 \
+		DEFAULTFONTDIR="${ED}"/usr/share/figlet \
+		install || die "make install failed"
+
+	dodoc README figfont.txt
+	dobashcompletion "${FILESDIR}"/figlet.bashcomp
+}
diff --git a/app-misc/figlet/files/figlet-222-includes.diff b/app-misc/figlet/files/figlet-222-includes.diff
new file mode 100644
index 000000000000..8be13b541c40
--- /dev/null
+++ b/app-misc/figlet/files/figlet-222-includes.diff
@@ -0,0 +1,20 @@
+--- a/chkfont.c	1998-03-06 01:00:00.000000000 +0100
++++ b/chkfont.c	2010-10-20 06:47:20.000000000 +0200
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdlib.h> /* exit() */
+ 
+ #define DATE "20 Feb 1996"
+ #define VERSION "2.2"
+--- a/figlet.c	2005-07-05 11:50:49.000000000 +0200
++++ b/figlet.c	2010-10-20 06:48:42.000000000 +0200
+@@ -59,6 +59,7 @@
+ #endif
+ #include <string.h>
+ #include <ctype.h>
++#include <unistd.h> /* close() getopt() */
+ #include <fcntl.h>     /* Needed for get_columns */
+ 
+ #ifdef unix