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.

Package-Manager: portage-2.2_rc98/cvs/Linux i686

4 files changed, 89 insertions, 2 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/Manifest b/app-misc/figlet/Manifest
index ad9dbac21e1a..a51b411345c4 100644
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -1,8 +1,10 @@
 AUX figlet-222-gentoo.diff 1029 RMD160 e02cffe306ea65e2288215d481a43e88bc74c2d2 SHA1 ab9d6144a70703f0f0e76b2435eb36440cece431 SHA256 824c6989201afdda6e78a39f6ad4561f3e37cc0be959ac84c5c0874c53c6e5c7
+AUX figlet-222-includes.diff 549 RMD160 0343610fc217e9e9d3c0409545facdf3f9600db9 SHA1 2f50ea22fe4831f8cb57569925dff2d3d7852e8c SHA256 0e1b3b2e3acf23b6861b93e5c3e55ea6d1a83057eb62c058964127fada2546c7
 AUX figlet.bashcomp 1489 RMD160 3fd1b0bdff690bf7402f1d756285b575d5b43101 SHA1 755f31de1b199040a09043c9ceff7402fd14b50d SHA256 0471eda509df61dcce2adab1932c86dce77e0999421c70cb05ac3c16563138d6
 DIST contributed-figlet-221.tar.gz 1393560 RMD160 823585a19fb504eafdc51c0b228121ed784ae54b SHA1 a23ecfdb54301e93b6578c3c465ba84c8f861d4f SHA256 2c569e052e638b28e4205023ae717f7b07e05695b728e4c80f4ce700354b18c8
 DIST figlet222.tar.gz 166727 RMD160 fc39809b1f5d5e498d722d49ae88132528633d9f SHA1 138aa027f90c0d68429c7b71af4e51c176bab92b SHA256 21f8f9e9b2190fbc0f801fb4704355e5d73d36c55670272cd08cad3408d1f5fe
 DIST ms-dos-figlet-221.tar.gz 2414 RMD160 63bbef976699747fdfd6f289ac3d22d4eb710dc8 SHA1 2bc48e0f1da9d585b7030a6986781525181c6357 SHA256 d3678a98b3b058ae4ded8525f51a1c53b3c6e6833793cf7cf98fcd9550ed7e70
+EBUILD figlet-222-r1.ebuild 1696 RMD160 36774c956bf2501dd699bca515abd49dd5683b7c SHA1 6cebca38ba6999f4414e26558928f27cba03380c SHA256 f9a377205ffabf18859606268e16cb6dd974d06b7512c1498d214e9b9ab7b954
 EBUILD figlet-222.ebuild 1717 RMD160 c6fb8259f56cec460f750957de65cdeb6ec30b5f SHA1 d055a9c9a890ad2a5ad7ef3ed90e12ac364698d8 SHA256 31480e553dd2bdbd39e48a85b5ac1b3d5650774b40936e3dee6c92e4bb8c9f8c
-MISC ChangeLog 4599 RMD160 1a883928c63eb7b57fdde15814eee7655fce52a0 SHA1 f6da2677347d02916a1f9d692f72a47881590659 SHA256 efffd9957d29cf26cf5d326e65fe3b8f0faa609e410b2663eb84cdae3839bdda
+MISC ChangeLog 4939 RMD160 9744db757f841558d6b782c5d91a5ab266043151 SHA1 eef00632b83ad551f8ca7ec543638205ee9bb73a SHA256 ca37957fabab5631ea905cff3c8f2f55dd7882359ebfbaca2a34897261259fd8
 MISC metadata.xml 253 RMD160 f574784ce11ddab7baf200be4286237456cb2233 SHA1 d3e6234fe741b4c5fd0887c5aa238345f5ae8d54 SHA256 fd6ace3f5b4164a271581180a27f7b94dd4f0a7d4e1525ab70d681c33ae1289a
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