cleanup

2 files changed, 54 insertions, 58 deletions

diff --git a/media-libs/svgalib/svgalib-1.4.2-r1.ebuild b/media-libs/svgalib/svgalib-1.4.2-r1.ebuild
index 501ebaa9019f..2f4d52ea9a50 100644
--- a/media-libs/svgalib/svgalib-1.4.2-r1.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.2-r1.ebuild
@@ -1,48 +1,46 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Peter Gavin <pete@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.2-r1.ebuild,v 1.2 2001/08/11 03:44:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.2-r1.ebuild,v 1.3 2002/04/27 11:47:44 seemant Exp $
 
-#P=
-A=${PN}-${PV}.tar.gz
-S=${WORKDIR}/${PN}-${PV}
+S=${WORKDIR}/${P}
 DESCRIPTION="a library for running svga graphics on the console"
-SRC_URI="http://www.svgalib.org/${A}"
+SRC_URI="http://www.svgalib.org/${P}.tar.gz"
 HOMEPAGE="http://www.svgalib.org/"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
-    patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
 }
 
 src_compile() {
 
-    try make OPTIMIZE="${CFLAGS}" static
-    try make OPTIMIZE="${CFLAGS}" shared
-    try make OPTIMIZE="${CFLAGS}" textutils
-    try make OPTIMIZE="${CFLAGS}" lrmi
-    try make OPTIMIZE="${CFLAGS}" utils
-    # Build the gl stuff tpp
-    try make OPTIMIZE="${CFLAGS}" -C gl
-    try make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
+	 make OPTIMIZE="${CFLAGS}" static || die
+	 make OPTIMIZE="${CFLAGS}" shared || die
+	 make OPTIMIZE="${CFLAGS}" textutils || die
+	 make OPTIMIZE="${CFLAGS}" lrmi || die
+	 make OPTIMIZE="${CFLAGS}" utils || die
+	# Build the gl stuff tpp
+	 make OPTIMIZE="${CFLAGS}" -C gl || die
+	 make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} || die
 }
 
 src_install () {
 
-    dodir /etc/svga /usr/{include,lib,bin,share/man}
-    try make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install
-    insinto /usr/include
-    doins gl/vgagl.h
-    dolib.a gl/libvgagl.a
-    dolib.so gl/libvgagl.so.${PV}
-    dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
-
-    cd doc
-    dodoc 0-README CHANGES* DESIGN NEWS TODO
-    docinto txt
-    dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
+	dodir /etc/svga /usr/{include,lib,bin,share/man}
+	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install || die
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a gl/libvgagl.a
+	dolib.so gl/libvgagl.so.${PV}
+	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
+
+	cd doc
+	dodoc 0-README CHANGES* DESIGN NEWS TODO
+	docinto txt
+	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
 
 }
diff --git a/media-libs/svgalib/svgalib-1.4.3.ebuild b/media-libs/svgalib/svgalib-1.4.3.ebuild
index 06b7ac43f14a..dbcc1f7da44f 100644
--- a/media-libs/svgalib/svgalib-1.4.3.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.3.ebuild
@@ -1,48 +1,46 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Peter Gavin <pete@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3.ebuild,v 1.2 2001/08/11 03:44:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3.ebuild,v 1.3 2002/04/27 11:47:45 seemant Exp $
 
-#P=
-A=${PN}-${PV}.tar.gz
-S=${WORKDIR}/${PN}-${PV}
+S=${WORKDIR}/${P}
 DESCRIPTION="a library for running svga graphics on the console"
-SRC_URI="http://www.svgalib.org/${A}"
+SRC_URI="http://www.svgalib.org/${P}.tar.gz"
 HOMEPAGE="http://www.svgalib.org/"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
-    patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
 }
 
 src_compile() {
 
-    try make OPTIMIZE="${CFLAGS}" static
-    try make OPTIMIZE="${CFLAGS}" shared
-    try make OPTIMIZE="${CFLAGS}" textutils
-    try make OPTIMIZE="${CFLAGS}" lrmi
-    try make OPTIMIZE="${CFLAGS}" utils
-    # Build the gl stuff tpp
-    try make OPTIMIZE="${CFLAGS}" -C gl
-    try make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
+	 make OPTIMIZE="${CFLAGS}" static || die
+	 make OPTIMIZE="${CFLAGS}" shared || die
+	 make OPTIMIZE="${CFLAGS}" textutils || die
+	 make OPTIMIZE="${CFLAGS}" lrmi || die
+	 make OPTIMIZE="${CFLAGS}" utils || die
+	# Build the gl stuff tpp
+	 make OPTIMIZE="${CFLAGS}" -C gl || die
+	 make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} || die
 }
 
 src_install () {
 
-    dodir /etc/svga /usr/{include,lib,bin,share/man}
-    try make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install
-    insinto /usr/include
-    doins gl/vgagl.h
-    dolib.a gl/libvgagl.a
-    dolib.so gl/libvgagl.so.${PV}
-    dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
-
-    cd doc
-    dodoc 0-README CHANGES* DESIGN NEWS TODO
-    docinto txt
-    dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
+	dodir /etc/svga /usr/{include,lib,bin,share/man}
+	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install || die
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a gl/libvgagl.a
+	dolib.so gl/libvgagl.so.${PV}
+	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
+
+	cd doc
+	dodoc 0-README CHANGES* DESIGN NEWS TODO
+	docinto txt
+	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
 
 }