fixums

2 files changed, 11 insertions, 81 deletions

diff --git a/sys-apps/fileutils/fileutils-4.1-r1.ebuild b/sys-apps/fileutils/fileutils-4.1-r1.ebuild
deleted file mode 100644
index c71c7568f1a1..000000000000
--- a/sys-apps/fileutils/fileutils-4.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1-r1.ebuild,v 1.1 2001/04/30 18:00:35 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}"
-HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
-
-DEPEND="virtual/glibc
-        nls? ( sys-devel/gettext )"
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use nls`" ]
-    then
-      myconf="--disable-nls"
-    fi
-	try ./configure --prefix=/usr --mandir=/usr/share/man \
-        --infodir=/usr/share/info --bindir=/bin ${myconf}
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static
-    fi
-}
-
-src_install() {
-
-    if [ -z "`use build`" ]
-    then
-	    make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info bindir=${D}/bin install
-	    cd ${D}
-        dodir /usr/bin
-        rm -rf usr/lib
-        cd usr/bin
-        ln -s ../../bin/* .
-        cd ${S}
-        dodoc COPYING NEWS README*  THANKS TODO ChangeLog ChangeLog-1997 AUTHORS
-     else
-        cd ${S}/src
-	    into /
-        dobin  chgrp chown dd dir du ln mkdir mknod rm touch \
-               chmod cp df ls mkfifo mv rmdir sync
-        newbin ginstall install
-        dosym /bin/install /usr/bin/install
-     fi
-
-}
-
diff --git a/sys-apps/fileutils/fileutils-4.1-r2.ebuild b/sys-apps/fileutils/fileutils-4.1-r2.ebuild
index 0e3605ad8ace..a99bbd0d2e9d 100644
--- a/sys-apps/fileutils/fileutils-4.1-r2.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1-r2.ebuild
@@ -1,51 +1,37 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1-r2.ebuild,v 1.2 2001/08/04 18:22:45 pete Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>, Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1-r2.ebuild,v 1.3 2001/10/06 17:04:49 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}"
+SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
 
-DEPEND="virtual/glibc
-        nls? ( sys-devel/gettext )"
+DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/glibc"
 
 src_compile() {
-
-    local myconf
-    if [ -z "`use nls`" ]
-    then
-      myconf="--disable-nls"
-    fi
-	try ./configure --prefix=/usr --mandir=/usr/share/man \
-        --infodir=/usr/share/info --bindir=/bin ${myconf}
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static
-    fi
+	local myconf
+	[ -z "`use nls`" ] && myconf="--disable-nls"
+	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --bindir=/bin ${myconf} || die
+	emake || die
 }
 
 src_install() {
-
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info bindir=${D}/bin install
+	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info bindir=${D}/bin install || die
 	cd ${D}
 	dodir /usr/bin
 	rm -rf usr/lib
 	cd usr/bin
 	ln -s ../../bin/* .
-	if [ -z "`use bootcd`" ] && [ -z "`use build`" ]
+	if [ -z "`use build`" ]
 	then
 		cd ${S}
 		dodoc COPYING NEWS README*  THANKS TODO ChangeLog ChangeLog-1997 AUTHORS
 	else
 		rm -rf ${D}/usr/share
 	fi
-
 }