cleanups

5 files changed, 16 insertions, 230 deletions

diff --git a/sys-apps/util-linux/files/util-linux-2.11g-r2-gentoo.diff b/sys-apps/util-linux/files/util-linux-2.11g-r2-gentoo.diff
deleted file mode 100644
index 2153a092e5c4..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.11g-r2-gentoo.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r -C2 util-linux-2.11g.orig/sys-utils/ipc.texi util-linux-2.11g/sys-utils/ipc.texi
-*** util-linux-2.11g.orig/sys-utils/ipc.texi	Thu Apr 12 17:11:42 2001
---- util-linux-2.11g/sys-utils/ipc.texi	Fri Aug  3 19:13:28 2001
-***************
-*** 7,10 ****
---- 7,15 ----
-       
-  @ifinfo
-+ 
-+ @direntry
-+ * ipc: (ipc).        Inter Process Communication.
-+ @end direntry
-+ 
-  This file documents the System V style inter process communication
-  primitives available under linux.
diff --git a/sys-apps/util-linux/util-linux-2.11b.ebuild b/sys-apps/util-linux/util-linux-2.11b.ebuild
deleted file mode 100644
index 99ff9b77185e..000000000000
--- a/sys-apps/util-linux/util-linux-2.11b.ebuild
+++ /dev/null
@@ -1,57 +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/util-linux/util-linux-2.11b.ebuild,v 1.3 2001/08/11 05:30:57 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/${P}.tar.gz"
-
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
-
-RDEPEND="$DEPEND
-	 sys-devel/perl"
-
-src_unpack() {
-
-    unpack ${P}.tar.gz
-    cd ${S}
-    cp MCONFIG MCONFIG.orig
-    sed -e "s:-pipe -O2 -m486 -fomit-frame-pointer:${CFLAGS}:" \
-        -e "s:CPU=.*:CPU=${CHOST%%-*}:" \
-        -e "s:HAVE_PAM=no:HAVE_PAM=yes:" \
-	-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
-	-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
-        -e "s:usr/man:usr/share/man:" \
-        -e "s:usr/info:usr/share/info:" \
-	MCONFIG.orig > MCONFIG.orig2
-     if [ "`use simpleinit`" ]
-     then
-	sed -e "s:HAVE_SYSVINIT=yes:HAVE_SYSVINIT=no:" \
-	    -e "s:HAVE_SYSVINIT_UTILS=yes:HAVE_SYSVINIT_UTILS=no:" \
-	MCONFIG.orig2 > MCONFIG
-     else
-        mv MCONFIG.orig2 MCONFIG
-     fi
-
-}
-
-src_compile() {
-
-	try ./configure
-	try make ${MAKEOPTS} LDFLAGS=""
-}
-
-
-src_install() {
-
-	try make DESTDIR=${D} install
-
-	dodoc HISTORY MAINTAINER README VERSION
-	docinto licenses
-	dodoc licenses/* HISTORY
-	docinto examples
-	dodoc example.files/*
-}
-
-
diff --git a/sys-apps/util-linux/util-linux-2.11g-r1.ebuild b/sys-apps/util-linux/util-linux-2.11g-r1.ebuild
deleted file mode 100644
index 153c98f7f606..000000000000
--- a/sys-apps/util-linux/util-linux-2.11g-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11g-r1.ebuild,v 1.1 2001/08/04 18:22:45 pete Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/${P}.tar.gz"
-
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
-
-RDEPEND="$DEPEND
-	 sys-devel/perl"
-
-src_unpack() {
-
-    unpack ${P}.tar.gz
-    cd ${S}
-    cp MCONFIG MCONFIG.orig
-    sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
-        -e "s:CPU=.*:CPU=${CHOST%%-*}:" \
-        -e "s:HAVE_PAM=no:HAVE_PAM=yes:" \
-	-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
-	-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
-        -e "s:usr/man:usr/share/man:" \
-        -e "s:usr/info:usr/share/info:" \
-	MCONFIG.orig > MCONFIG.orig2
-     if [ "`use simpleinit`" ]
-     then
-	sed -e "s:HAVE_SYSVINIT=yes:HAVE_SYSVINIT=no:" \
-	    -e "s:HAVE_SYSVINIT_UTILS=yes:HAVE_SYSVINIT_UTILS=no:" \
-	MCONFIG.orig2 > MCONFIG
-     else
-        mv MCONFIG.orig2 MCONFIG
-     fi
-
-}
-
-src_compile() {
-
-	try ./configure
-	try make ${MAKEOPTS} LDFLAGS=""
-}
-
-
-src_install() {
-
-	try make DESTDIR=${D} install
-	
-	if [ -z "`use bootcd`" ]
-	then
-		dodoc HISTORY MAINTAINER README VERSION
-		docinto licenses
-		dodoc licenses/* HISTORY
-		docinto examples
-		dodoc example.files/*
-	else
-		rm -rf ${D}/usr/games
-		rm -rf ${D}/usr/share/{doc,man,info,misc/getopt,locale}
-	fi
-}
-
-
diff --git a/sys-apps/util-linux/util-linux-2.11g.ebuild b/sys-apps/util-linux/util-linux-2.11g.ebuild
deleted file mode 100644
index b3ecb24675ac..000000000000
--- a/sys-apps/util-linux/util-linux-2.11g.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11g.ebuild,v 1.3 2001/08/11 05:30:57 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/${P}.tar.gz"
-
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
-
-RDEPEND="$DEPEND
-	 sys-devel/perl"
-
-src_unpack() {
-
-    unpack ${P}.tar.gz
-    cd ${S}
-    cp MCONFIG MCONFIG.orig
-    sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
-        -e "s:CPU=.*:CPU=${CHOST%%-*}:" \
-        -e "s:HAVE_PAM=no:HAVE_PAM=yes:" \
-	-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
-	-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
-        -e "s:usr/man:usr/share/man:" \
-        -e "s:usr/info:usr/share/info:" \
-	MCONFIG.orig > MCONFIG.orig2
-     if [ "`use simpleinit`" ]
-     then
-	sed -e "s:HAVE_SYSVINIT=yes:HAVE_SYSVINIT=no:" \
-	    -e "s:HAVE_SYSVINIT_UTILS=yes:HAVE_SYSVINIT_UTILS=no:" \
-	MCONFIG.orig2 > MCONFIG
-     else
-        mv MCONFIG.orig2 MCONFIG
-     fi
-
-}
-
-src_compile() {
-
-	try ./configure
-	try make ${MAKEOPTS} LDFLAGS=""
-}
-
-
-src_install() {
-
-	try make DESTDIR=${D} install
-
-	dodoc HISTORY MAINTAINER README VERSION
-	docinto licenses
-	dodoc licenses/* HISTORY
-	docinto examples
-	dodoc example.files/*
-}
-
-
diff --git a/sys-apps/util-linux/util-linux-2.11l.ebuild b/sys-apps/util-linux/util-linux-2.11l.ebuild
index 7a2fb237a671..1050cda956c2 100644
--- a/sys-apps/util-linux/util-linux-2.11l.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11l.ebuild
@@ -1,7 +1,8 @@
-# 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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11l.ebuild,v 1.1 2001/10/10 22:05:04 azarah Exp $
+# Maintainer: System Team <system@gentoo.org>
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11l.ebuild,v 1.2 2001/10/12 00:54:42 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various useful Linux utilities"
@@ -9,52 +10,29 @@ SRC_URI="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/${P}.tar.gz"
 
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 
-RDEPEND="$DEPEND
-	 sys-devel/perl"
+RDEPEND="$DEPEND sys-devel/perl"
 
 src_unpack() {
-
-    unpack ${P}.tar.gz
-    cd ${WORKDIR}
-    patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-    cd ${S}
-    cp MCONFIG MCONFIG.orig
-    sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
-        -e "s:CPU=.*:CPU=${CHOST%%-*}:" \
-        -e "s:HAVE_PAM=no:HAVE_PAM=yes:" \
-	-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
-	-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
-        -e "s:usr/man:usr/share/man:" \
-        -e "s:usr/info:usr/share/info:" \
-	MCONFIG.orig > MCONFIG.orig2
-     if [ "`use simpleinit`" ]
-     then
-	sed -e "s:HAVE_SYSVINIT=yes:HAVE_SYSVINIT=no:" \
-	    -e "s:HAVE_SYSVINIT_UTILS=yes:HAVE_SYSVINIT_UTILS=no:" \
-	MCONFIG.orig2 > MCONFIG
-     else
-        mv MCONFIG.orig2 MCONFIG
-     fi
-
+	unpack ${P}.tar.gz
+	cd ${WORKDIR}
+#	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	cd ${S}
+	cp MCONFIG MCONFIG.orig
+	sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" -e "s:CPU=.*:CPU=${CHOST%%-*}:" -e "s:HAVE_PAM=no:HAVE_PAM=yes:" -e "s:HAVE_SLN=no:HAVE_SLN=yes:" -e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" -e "s:usr/man:usr/share/man:" -e "s:usr/info:usr/share/info:" MCONFIG.orig > MCONFIG.orig2
+	mv MCONFIG.orig2 MCONFIG
 }
 
 src_compile() {
-
-	try ./configure
-	try make ${MAKEOPTS} LDFLAGS=""
-	cd sys-utils; try makeinfo *.texi; cd ..
+	./configure || die
+	emake LDFLAGS="" || die
+	cd sys-utils; makeinfo *.texi || die ; cd ..
 }
 
-
 src_install() {
-
-	try make DESTDIR=${D} install
-
+	make DESTDIR=${D} install || die
 	dodoc HISTORY MAINTAINER README VERSION
 	docinto licenses
 	dodoc licenses/* HISTORY
 	docinto examples
 	dodoc example.files/*
 }
-
-