diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2014-10-27 16:21:30 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-10-27 16:21:30 +0000 |
commit | f67eeb47fde239108e9bef54d9886fede4e88bb5 (patch) | |
tree | cab3d531a10ca042ba65cd78b14d6d214a51a95a /app-misc | |
parent | tidy (diff) | |
download | gentoo-2-f67eeb47fde239108e9bef54d9886fede4e88bb5.tar.gz gentoo-2-f67eeb47fde239108e9bef54d9886fede4e88bb5.tar.bz2 gentoo-2-f67eeb47fde239108e9bef54d9886fede4e88bb5.zip |
old
(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/figlet/ChangeLog | 6 | ||||
-rw-r--r-- | app-misc/figlet/figlet-222.ebuild | 56 | ||||
-rw-r--r-- | app-misc/figlet/files/figlet-222-gentoo.diff | 37 | ||||
-rw-r--r-- | app-misc/figlet/files/figlet-222-includes.diff | 20 |
4 files changed, 5 insertions, 114 deletions
diff --git a/app-misc/figlet/ChangeLog b/app-misc/figlet/ChangeLog index e0f6720e662f..51651840396b 100644 --- a/app-misc/figlet/ChangeLog +++ b/app-misc/figlet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/figlet # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/ChangeLog,v 1.48 2014/10/27 15:58:05 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/ChangeLog,v 1.49 2014/10/27 16:21:30 mr_bones_ Exp $ + + 27 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org> -figlet-222.ebuild, + -files/figlet-222-gentoo.diff, -files/figlet-222-includes.diff: + old 27 Oct 2014; Agostino Sarubbo <ago@gentoo.org> figlet-2.2.5.ebuild: Stable for ppc64, wrt bug #520870 diff --git a/app-misc/figlet/figlet-222.ebuild b/app-misc/figlet/figlet-222.ebuild deleted file mode 100644 index 020f99c4cab1..000000000000 --- a/app-misc/figlet/figlet-222.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/figlet-222.ebuild,v 1.19 2013/07/28 12:03:22 grobian 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 ~x64-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 clean - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} ${LDFLAGS}" \ - all || die -} - -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-gentoo.diff b/app-misc/figlet/files/figlet-222-gentoo.diff deleted file mode 100644 index a7f18879deaa..000000000000 --- a/app-misc/figlet/files/figlet-222-gentoo.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- Makefile.org 2003-07-17 23:56:17.000000000 +0200 -+++ Makefile 2003-07-17 23:57:57.000000000 +0200 -@@ -15,21 +15,29 @@ - CFLAGS = -g - - # Where the executables should be put --DESTDIR = /usr/local/bin -+ifndef DESTDIR -+ DESTDIR = /usr/bin -+endif - - # Where the man page should be put --MANDIR = /usr/local/man/man6 -+ifndef MANDIR -+ MANDIR = /usr/share/man/man6 -+endif - - # Where figlet will search first for fonts (the ".flf" files). --DEFAULTFONTDIR = /usr/local/share/figlet -+ifndef DEFAULTFONTDIR -+ DEFAULTFONTDIR = /usr/share/figlet -+endif - # Use this definition if you can't put things in /usr/local/share/figlet --DEFAULTFONTDIR = fonts -+#DEFAULTFONTDIR = fonts - - # The filename of the font to be used if no other is specified - # (standard.flf is recommended, but any other can be used). - # This font file should reside in the directory specified by - # DEFAULTFONTDIR. --DEFAULTFONTFILE = standard.flf -+ifndef DEFAULTFONTFILE -+ DEFAULTFONTFILE = standard.flf -+endif - - ## - ## END OF CONFIGURATION SECTION diff --git a/app-misc/figlet/files/figlet-222-includes.diff b/app-misc/figlet/files/figlet-222-includes.diff deleted file mode 100644 index 8be13b541c40..000000000000 --- a/app-misc/figlet/files/figlet-222-includes.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 |