summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Shepherd <masterdriverz@gentoo.org>2006-12-01 23:11:41 +0000
committerCharlie Shepherd <masterdriverz@gentoo.org>2006-12-01 23:11:41 +0000
commit7a3f78fb4d60578baf946528f49d5948ace025cf (patch)
tree6f86795bdaf4c412f3707b723f8f80be0f4091e8 /app-misc/cmatrix
parentVersion bump (diff)
downloadgentoo-2-7a3f78fb4d60578baf946528f49d5948ace025cf.tar.gz
gentoo-2-7a3f78fb4d60578baf946528f49d5948ace025cf.tar.bz2
gentoo-2-7a3f78fb4d60578baf946528f49d5948ace025cf.zip
Clean up ebuild, add || die and inherit autotools, bug 151291
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'app-misc/cmatrix')
-rw-r--r--app-misc/cmatrix/ChangeLog6
-rw-r--r--app-misc/cmatrix/cmatrix-1.2a.ebuild22
2 files changed, 17 insertions, 11 deletions
diff --git a/app-misc/cmatrix/ChangeLog b/app-misc/cmatrix/ChangeLog
index d3de012bc4d6..0473382bdf9c 100644
--- a/app-misc/cmatrix/ChangeLog
+++ b/app-misc/cmatrix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/cmatrix
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cmatrix/ChangeLog,v 1.14 2006/11/25 21:38:02 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cmatrix/ChangeLog,v 1.15 2006/12/01 23:11:41 masterdriverz Exp $
+
+ 01 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+ cmatrix-1.2a.ebuild:
+ Clean up ebuild, add || die and inherit autotools, bug 151291
25 Nov 2006; Charlie Shepherd <masterdriverz@gentoo.org> metadata.xml:
Mine ... all mine!!
diff --git a/app-misc/cmatrix/cmatrix-1.2a.ebuild b/app-misc/cmatrix/cmatrix-1.2a.ebuild
index 49ee33bddbf9..2c991825124e 100644
--- a/app-misc/cmatrix/cmatrix-1.2a.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a.ebuild
@@ -1,8 +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/cmatrix/cmatrix-1.2a.ebuild,v 1.19 2006/02/14 04:13:58 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cmatrix/cmatrix-1.2a.ebuild,v 1.20 2006/12/01 23:11:41 masterdriverz Exp $
-inherit eutils
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools
DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
HOMEPAGE="http://www.asty.org/cmatrix.html"
@@ -23,29 +25,29 @@ src_unpack() {
# sandbox.
cd ${S}
epatch ${FILESDIR}/${P}-gentoo.patch
- automake
+ eautomake || die 'automake failed'
}
src_install() {
- dodir /usr/share/consolefonts
- dodir /usr/lib/kbd/consolefonts
+ dodir /usr/share/consolefonts || die 'dodir failed'
+ dodir /usr/lib/kbd/consolefonts || die 'dodir failed'
if use X ; then
- dodir /usr/lib/X11/fonts/misc
- dodir /usr/X11R6/lib/X11/fonts/misc
+ dodir /usr/lib/X11/fonts/misc || die 'dodir failed'
+ dodir /usr/X11R6/lib/X11/fonts/misc || die 'dodir failed'
fi
- make DESTDIR=${D} install || die
+ emake DESTDIR=${D} install || die 'emake install failed'
}
pkg_postinst() {
if use X ; then
if [ -d ${ROOT}/usr/lib/X11/fonts/misc ] ; then
einfo ">>> Running mkfontdir on ${ROOT}/usr/lib/X11/fonts/misc"
- mkfontdir ${ROOT}/usr/lib/X11/fonts/misc
+ mkfontdir ${ROOT}/usr/lib/X11/fonts/misc || die 'mkfontdir failed'
fi
if [ -d ${ROOT}/usr/X11R6/lib/X11/fonts/misc ] ; then
einfo ">>> Running mkfontdir on ${ROOT}/usr/X11R6/lib/X11/fonts/misc"
- mkfontdir ${ROOT}/usr/X11R6/lib/X11/fonts/misc
+ mkfontdir ${ROOT}/usr/X11R6/lib/X11/fonts/misc || die 'mkfontdir failed'
fi
fi
}