touchups

Package-Manager: portage-2.1.1-r2

diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
index 2b61839d8bf401249fb0e8e1db8a36fff96c4ce0..f4bc98d52158c053d5622b99e3c297160a361dac 100644 (file)
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -10,13 +10,13 @@ AUX figlet.bashcomp 1489 RMD160 3fd1b0bdff690bf7402f1d756285b575d5b43101 SHA1 75
 MD5 037d80f2223647ba31fce7b92f2cad73 files/figlet.bashcomp 1489
 RMD160 3fd1b0bdff690bf7402f1d756285b575d5b43101 files/figlet.bashcomp 1489
 SHA256 0471eda509df61dcce2adab1932c86dce77e0999421c70cb05ac3c16563138d6 files/figlet.bashcomp 1489
-DIST contributed-figlet-221.tar.gz 1393560 RMD160 823585a19fb504eafdc51c0b228121ed784ae54b SHA256 2c569e052e638b28e4205023ae717f7b07e05695b728e4c80f4ce700354b18c8
-DIST figlet221.tar.gz 172219 RMD160 5b8b7c144f02728227b465f7d337c9c6642c36f6 SHA256 8793b2a090924591d119f6dbd6c10f829dbc1fe7edef76e321b0664956b25a2e
-DIST ms-dos-figlet-221.tar.gz 2414 RMD160 63bbef976699747fdfd6f289ac3d22d4eb710dc8 SHA256 d3678a98b3b058ae4ded8525f51a1c53b3c6e6833793cf7cf98fcd9550ed7e70
-EBUILD figlet-221-r1.ebuild 1626 RMD160 e8cdd9caff6cd301e75ffc94e9b8e3eb9464a128 SHA1 d25f44c7463e5f84dc88b5ab52ed5e4dd9fb163f SHA256 e40d25f75cdba2e7495424be70924ca621b9e593e93f9f503e551e62e8d46d2e
-MD5 40df85a6c2efdc0552e56a3139d45f2e figlet-221-r1.ebuild 1626
-RMD160 e8cdd9caff6cd301e75ffc94e9b8e3eb9464a128 figlet-221-r1.ebuild 1626
-SHA256 e40d25f75cdba2e7495424be70924ca621b9e593e93f9f503e551e62e8d46d2e figlet-221-r1.ebuild 1626
+DIST contributed-figlet-221.tar.gz 1393560 RMD160 823585a19fb504eafdc51c0b228121ed784ae54b SHA1 a23ecfdb54301e93b6578c3c465ba84c8f861d4f SHA256 2c569e052e638b28e4205023ae717f7b07e05695b728e4c80f4ce700354b18c8
+DIST figlet221.tar.gz 172219 RMD160 5b8b7c144f02728227b465f7d337c9c6642c36f6 SHA1 f11ee2e158959bed59410e4eb2c2bd3da597dbf1 SHA256 8793b2a090924591d119f6dbd6c10f829dbc1fe7edef76e321b0664956b25a2e
+DIST ms-dos-figlet-221.tar.gz 2414 RMD160 63bbef976699747fdfd6f289ac3d22d4eb710dc8 SHA1 2bc48e0f1da9d585b7030a6986781525181c6357 SHA256 d3678a98b3b058ae4ded8525f51a1c53b3c6e6833793cf7cf98fcd9550ed7e70
+EBUILD figlet-221-r1.ebuild 1617 RMD160 bb2e0f0e4b2a7c7290bdcab8c3fa1d7df666cfb3 SHA1 0476a259aa7869d7a21fa742ed4a89104a703e8a SHA256 74df198d4c8bd8ac309fdaae0869471bf5121c3f7f6e3ceb7946a66f8b967ac7
+MD5 3d3c5063c2e0cb177266d2d55b25161f figlet-221-r1.ebuild 1617
+RMD160 bb2e0f0e4b2a7c7290bdcab8c3fa1d7df666cfb3 figlet-221-r1.ebuild 1617
+SHA256 74df198d4c8bd8ac309fdaae0869471bf5121c3f7f6e3ceb7946a66f8b967ac7 figlet-221-r1.ebuild 1617
 MISC ChangeLog 2658 RMD160 49c41507edecaa9ddd5d6fdf0e61aa119dae4159 SHA1 c7d4ca580922ffc46dcc257b051ef0b08edc9b60 SHA256 31217b9245da619921fabec6f639838ca33a6c7c3ddce34d7d5a08893eb064dd
 MD5 9e1ea26056cfb5f1dd5f1ac59052e682 ChangeLog 2658
 RMD160 49c41507edecaa9ddd5d6fdf0e61aa119dae4159 ChangeLog 2658

diff --git a/app-misc/figlet/figlet-221-r1.ebuild b/app-misc/figlet/figlet-221-r1.ebuild
index 37f08adda687769a8528200550a9ebcc8b0a4795..5bf0e4f29b0d3169226bc0b08c6704d6f7bc28cd 100644 (file)
--- a/app-misc/figlet/figlet-221-r1.ebuild
+++ b/app-misc/figlet/figlet-221-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/figlet-221-r1.ebuild,v 1.12 2006/06/16 20:40:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/figlet-221-r1.ebuild,v 1.13 2006/12/20 23:11:41 mr_bones_ Exp $
 
 inherit eutils bash-completion
 
 MY_P=${P/-/}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="program for making large letters out of ordinary text"
 HOMEPAGE="http://www.figlet.org/"
 # Bug 35339 - add more fonts to figlet ebuild
@@ -20,23 +19,23 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-       >=sys-apps/sed-4"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
-       cp ${WORKDIR}/contributed/C64-fonts/*.flf fonts/
-       cp ${WORKDIR}/contributed/bdffonts/*.flf fonts/
-       cp ${WORKDIR}/ms-dos/*.flf fonts/
-       cp ${WORKDIR}/contributed/*.flf fonts/
+       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
+       epatch "${FILESDIR}"/${P}-gentoo.diff
        sed -i \
-               -e "s/CFLAGS = -g/CFLAGS = ${CFLAGS}/g" Makefile || \
-                       die "sed Makefile failed"
+               -e "s/CFLAGS = -g/CFLAGS = ${CFLAGS}/g" Makefile \
+               || die "sed failed"
 }
 
 src_compile() {
@@ -45,14 +44,14 @@ src_compile() {
 }
 
 src_install() {
-       dodir /usr/bin /usr/share/man/man6
+       dodir /usr/bin /usr/share/man/man6 || die "dodir failed"
        chmod +x figlist showfigfonts
-       make \
-               DESTDIR=${D}/usr/bin \
-               MANDIR=${D}/usr/share/man/man6 \
-           DEFAULTFONTDIR=${D}/usr/share/figlet \
+       emake \
+               DESTDIR="${D}"/usr/bin \
+               MANDIR="${D}"/usr/share/man/man6 \
+           DEFAULTFONTDIR="${D}"/usr/share/figlet \
                install || die "make install failed"
 
-       dodoc README figfont.txt || die "dodoc failed"
-       dobashcompletion ${FILESDIR}/figlet.bashcomp
+       dodoc README figfont.txt
+       dobashcompletion "${FILESDIR}"/figlet.bashcomp
 }