Clean up ebuild, add || die and inherit autotools, bug 151291

Package-Manager: portage-2.1.2_rc2-r2

3 files changed, 25 insertions, 19 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/Manifest b/app-misc/cmatrix/Manifest
index 12eacd99ad40..6d25cd3ec0f4 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -3,14 +3,14 @@ MD5 9bfecf967586ff4ee812fbff868b34b1 files/cmatrix-1.2a-gentoo.patch 3034
 RMD160 59ba4db1eeb9f8242d070e29b3154212ed47cc2d files/cmatrix-1.2a-gentoo.patch 3034
 SHA256 a3c9646fe96da2a8509460c9afdb6ad85d1b704d01393d41825a1897fb49ff80 files/cmatrix-1.2a-gentoo.patch 3034
 DIST cmatrix-1.2a.tar.gz 74376 RMD160 8a401753ca0e88c0d24b6a8c3f23b725368c13bb SHA1 ca078c10322a47e327f07a44c9a42b52eab5ad93 SHA256 1fa6e6caea254b6fe70a492efddc1b40ad7ccb950a5adfd80df75b640577064c
-EBUILD cmatrix-1.2a.ebuild 1340 RMD160 de4647e5bd305f769c586072ca1efe0df4defc4c SHA1 abd1aad0cc667a6a1c716691e7a9d79e995ed768 SHA256 d7f5eaa2becdba2d13efda17fad4877895697883aaf8711ef7f380e730fa655b
-MD5 1502647a5d229b114f5d1d8497a605de cmatrix-1.2a.ebuild 1340
-RMD160 de4647e5bd305f769c586072ca1efe0df4defc4c cmatrix-1.2a.ebuild 1340
-SHA256 d7f5eaa2becdba2d13efda17fad4877895697883aaf8711ef7f380e730fa655b cmatrix-1.2a.ebuild 1340
-MISC ChangeLog 1403 RMD160 6dec4f950fcea0bf6618bda89abd0ee892e75c03 SHA1 2d9177d9b5d2d166720318717aa9de9762b1fafd SHA256 1651fc45b218f1dab71f40451c3bad48935464fe19fc40e9d8c858b0edeb82d1
-MD5 7fb72175a29e6439e245454c3ad2fc1c ChangeLog 1403
-RMD160 6dec4f950fcea0bf6618bda89abd0ee892e75c03 ChangeLog 1403
-SHA256 1651fc45b218f1dab71f40451c3bad48935464fe19fc40e9d8c858b0edeb82d1 ChangeLog 1403
+EBUILD cmatrix-1.2a.ebuild 1564 RMD160 5bd483cc11c8ea2d39e494475d7e26a7a8689832 SHA1 13e6587ae0fced2bacd67d00390896a40c28117c SHA256 aef385aa01a323434d68a8bdd84edeae46ffcc0de8597e577f1736dd692749b3
+MD5 bce2d436ff0cb62a687d8d4475d16825 cmatrix-1.2a.ebuild 1564
+RMD160 5bd483cc11c8ea2d39e494475d7e26a7a8689832 cmatrix-1.2a.ebuild 1564
+SHA256 aef385aa01a323434d68a8bdd84edeae46ffcc0de8597e577f1736dd692749b3 cmatrix-1.2a.ebuild 1564
+MISC ChangeLog 1550 RMD160 89c39e3a5608ee772db7f28fb8533af325a6d95f SHA1 74fc8427fd057c5c8599557c74b9a4a4a5fe7167 SHA256 a2806da91bb9d20f978b111d2c4a28554a11869b3e757e6bd73a8dd27beaed95
+MD5 28e1cd048b55f8d0b8556e48508455ac ChangeLog 1550
+RMD160 89c39e3a5608ee772db7f28fb8533af325a6d95f ChangeLog 1550
+SHA256 a2806da91bb9d20f978b111d2c4a28554a11869b3e757e6bd73a8dd27beaed95 ChangeLog 1550
 MISC metadata.xml 238 RMD160 784ba38f1dd7bd922f6081768fffc41e7ea810a9 SHA1 a14c90b1b68ba21479602daade809a004cb83fa1 SHA256 e9d5b08c99c1747aec6620f520df887057e528699e4919357a9e6bcd0b613fd0
 MD5 05582aef7e36401ff5a00980c5cb9536 metadata.xml 238
 RMD160 784ba38f1dd7bd922f6081768fffc41e7ea810a9 metadata.xml 238
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
 }