removed cruft

9 files changed, 2 insertions, 372 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 889f9387ebfe..0d2c5a997868 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,16 +1,8 @@
 MD5 3f738c149e18be2c4ddaf28207532a3e util-linux-2.11y.ebuild 2102
-MD5 f0ca9bfd03dd9dfb19f90d6fa293cadb util-linux-2.11z-r2.ebuild 2244
-MD5 e3284d82c8a0bdb423d59e0db0938916 util-linux-2.11z-r4.ebuild 2474
-MD5 2d40c7c6fcebb69566baf1b824a34e0f util-linux-2.11z-r1.ebuild 2326
-MD5 7eadd69eea3ba2b4634baa4e0d6a479f util-linux-2.11z-r3.ebuild 2374
-MD5 9c21573bab76550a6a1db7377328468e util-linux-2.11o-r3.ebuild 1698
-MD5 3133b3c9d9eb1db73cc9479a5a384199 ChangeLog 6086
+MD5 0465a6f139fd8548a80fc5386be5a505 util-linux-2.11z-r4.ebuild 2412
+MD5 d3772681398d6c5ed5c1d6730ce5e5af ChangeLog 6230
 MD5 48e36b9b6ea3bed4ea25292f9ae5a958 files/digest-util-linux-2.11y 152
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11y-parallel-make.patch 369
-MD5 939305c630f0d2196de84e79f220dd8d files/digest-util-linux-2.11o-r3 138
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r1 153
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r2 153
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r3 153
 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r4 153
 MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698
 MD5 50b088dbe0471cb0a49ad1f9b967ee04 files/util-linux-2.11u-gentoo.patch 367
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11o-r3 b/sys-apps/util-linux/files/digest-util-linux-2.11o-r3
deleted file mode 100644
index 30b511b04c19..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.11o-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 38ddea8feec3af4847012d7a0be2f9ae util-linux-2.11o.tar.gz 1490079
-MD5 dc020755682a383607c792b37b36d94e util-linux-2.11o.patch.gz 18710
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11z-r1 b/sys-apps/util-linux/files/digest-util-linux-2.11z-r1
deleted file mode 100644
index b479cd78fc10..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.11z-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 abaab0a441233d6b7763b89ea5ab4078 util-linux-2.11z.tar.bz2 1266784
-MD5 9d6c4c8a99188b6696b0735fa48f67c2 util-linux-2.11z-crypt-gentoo.patch.bz2 18249
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11z-r2 b/sys-apps/util-linux/files/digest-util-linux-2.11z-r2
deleted file mode 100644
index b479cd78fc10..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.11z-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 abaab0a441233d6b7763b89ea5ab4078 util-linux-2.11z.tar.bz2 1266784
-MD5 9d6c4c8a99188b6696b0735fa48f67c2 util-linux-2.11z-crypt-gentoo.patch.bz2 18249
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11z-r3 b/sys-apps/util-linux/files/digest-util-linux-2.11z-r3
deleted file mode 100644
index b479cd78fc10..000000000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.11z-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 abaab0a441233d6b7763b89ea5ab4078 util-linux-2.11z.tar.bz2 1266784
-MD5 9d6c4c8a99188b6696b0735fa48f67c2 util-linux-2.11z-crypt-gentoo.patch.bz2 18249
diff --git a/sys-apps/util-linux/util-linux-2.11o-r3.ebuild b/sys-apps/util-linux/util-linux-2.11o-r3.ebuild
deleted file mode 100644
index fab947877e4a..000000000000
--- a/sys-apps/util-linux/util-linux-2.11o-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11o-r3.ebuild,v 1.16 2003/05/25 15:26:46 mholzer Exp $
-
-inherit eutils
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
-	mirror://kernel/linux/kernel/people/hvr/util-linux-patch-int/${P}.patch.gz"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-KEYWORDS="x86 ppc sparc mips"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2-r2
-	sys-apps/pam-login"
-RDEPEND="${DEPEND} dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-SLOT="0"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${WORKDIR}
-	cd ${S}
-	epatch ${DISTDIR}/${P}.patch.gz
-	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
-}
-
-src_compile() {
-	./configure || die
-
-	if [ -z "`use nls`" ]
-	then
-		cp defines.h defines.h.orig	
-		cp Makefile Makefile.orig
-		
-		sed -e "s/#define ENABLE_NLS//g" \
-			-e "s/#define HAVE_libintl_h//g" \
-			defines.h.orig > defines.h
-	
-		sed "s/\(^SUBDIRS=\)po/\1lib/g" \
-			Makefile.orig > Makefile
-	fi
-	
-	emake LDFLAGS="" || die
-	cd sys-utils; makeinfo *.texi || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	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.11z-r1.ebuild b/sys-apps/util-linux/util-linux-2.11z-r1.ebuild
deleted file mode 100644
index c72c4d357c0e..000000000000
--- a/sys-apps/util-linux/util-linux-2.11z-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r1.ebuild,v 1.9 2003/05/25 15:26:46 mholzer Exp $
-
-IUSE="crypt nls selinux"
-
-inherit eutils flag-o-matic
-
-filter-flags -fPIC
-
-S=${WORKDIR}/${P}
-CRYPT_PATCH_P="${P}-crypt-gentoo"
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2
-	crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~mips"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2-r2
-	!selinux? ( sys-apps/pam-login )
-	selinux? ( sys-apps/shadow )"
-
-
-RDEPEND="${DEPEND} dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	if [ ! -z "`use crypt`" ]
-	then
-		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
-	fi
-
-	# Fix rare failures with -j4 or higher
-	epatch ${FILESDIR}/${P}-parallel-make.patch
-
-	# Fix unreadable df output
-	epatch ${FILESDIR}/no-symlink-resolve.patch
-
-	# <kumba@gentoo.org> (22 Apr 2003)
-	# Fix fdisk so it works on SGI Disk Labels and lets the user
-	# Actually select a partition, rather than automatically
-	# choosing "4".
-	if [ "${ARCH}" = "mips" ]
-	then
-		epatch ${FILESDIR}/${P}-mips-fdisk-fix.patch
-	fi
-
-
-	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
-}
-
-src_compile() {
-
-	./configure || die "config"
-
-	if [ -z "`use nls`" ]
-	then
-		cp defines.h defines.h.orig	
-		grep -v "ENABLE_NLS" \
-			defines.h.orig > defines.h
-		cp defines.h defines.h.orig
-		grep -v "HAVE_libintl_h" \
-			defines.h.orig > defines.h
-
-		cp Makefile Makefile.orig
-		sed -e "s:SUBDIRS=po \\\:SUBDIRS= \\\:g" \
-			Makefile.orig > Makefile
-	fi
-	
-	emake LDFLAGS="" || die
-	cd sys-utils; makeinfo *.texi || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	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.11z-r2.ebuild b/sys-apps/util-linux/util-linux-2.11z-r2.ebuild
deleted file mode 100644
index 47a1682ec88d..000000000000
--- a/sys-apps/util-linux/util-linux-2.11z-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r2.ebuild,v 1.2 2003/05/25 15:26:46 mholzer Exp $
-
-IUSE="crypt nls selinux static"
-
-inherit eutils flag-o-matic
-
-filter-flags -fPIC
-
-S=${WORKDIR}/${P}
-CRYPT_PATCH_P="${P}-crypt-gentoo"
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2
-	crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~mips"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	>=sed-4.0.5
-	>=sys-libs/ncurses-5.2-r2
-	!selinux? ( sys-apps/pam-login )
-	selinux? ( sys-apps/shadow )"
-
-RDEPEND="${DEPEND} dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	if [ ! -z "`use crypt`" ] ; then
-		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
-	fi
-
-	# Fix rare failures with -j4 or higher
-	epatch ${FILESDIR}/${P}-parallel-make.patch
-
-	# Fix unreadable df output
-	epatch ${FILESDIR}/no-symlink-resolve.patch
-
-	# <kumba@gentoo.org> (22 Apr 2003)
-	# Fix fdisk so it works on SGI Disk Labels and lets the user
-	# Actually select a partition, rather than automatically
-	# choosing "4".
-	if [ "${ARCH}" = "mips" ]
-	then
-		epatch ${FILESDIR}/${P}-mips-fdisk-fix.patch
-	fi
-
-
-	sed -i \
-		-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 || die "MCONFIG sed"
-
-	if [ -z "`use nls`" ] ; then
-		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
-			die "MCONFIG nls sed"
-	fi
-}
-
-src_compile() {
-
-	econf || die "configure failed"
-
-	if [ "`use static`" ] ; then
-		export LDFLAGS=-static
-	fi
-	emake || die "emake failed"
-	cd sys-utils && makeinfo *.texi || die "makeinfo failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	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.11z-r3.ebuild b/sys-apps/util-linux/util-linux-2.11z-r3.ebuild
deleted file mode 100644
index 66f4e9e1939d..000000000000
--- a/sys-apps/util-linux/util-linux-2.11z-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r3.ebuild,v 1.7 2003/05/29 21:28:39 method Exp $
-
-IUSE="crypt nls selinux static pam"
-
-inherit eutils flag-o-matic
-
-filter-flags -fPIC
-
-S=${WORKDIR}/${P}
-CRYPT_PATCH_P="${P}-crypt-gentoo"
-DESCRIPTION="Various useful Linux utilities"
-SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2
-	crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-
-KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~mips"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4.0.5
-	>=sys-libs/ncurses-5.2-r2
-	!selinux? ( pam? ( sys-apps/pam-login ) )
-	selinux? ( sys-apps/shadow )"
-
-RDEPEND="${DEPEND} dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	if [ ! -z "`use crypt`" ] ; then
-		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
-	fi
-
-	# Fix rare failures with -j4 or higher
-	epatch ${FILESDIR}/${P}-parallel-make.patch
-
-	# Fix unreadable df output
-	epatch ${FILESDIR}/no-symlink-resolve.patch
-
-	# <kumba@gentoo.org> (22 Apr 2003)
-	# Fix fdisk so it works on SGI Disk Labels and lets the user
-	# Actually select a partition, rather than automatically
-	# choosing "4".
-	if [ "${ARCH}" = "mips" ]
-	then
-		epatch ${FILESDIR}/${P}-mips-fdisk-fix.patch
-	fi
-
-	#enable pam only if we use it
-	use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG || die "MCONFIG Pam"
-
-	sed -i \
-		-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 || die "MCONFIG sed"
-
-	if [ -z "`use nls`" ] ; then
-		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
-			die "MCONFIG nls sed"
-	fi
-}
-
-src_compile() {
-
-	econf || die "configure failed"
-
-	if [ "`use static`" ] ; then
-		export LDFLAGS=-static
-	fi
-	emake || die "emake failed"
-	cd sys-utils && makeinfo *.texi || die "makeinfo failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	dodoc HISTORY MAINTAINER README VERSION
-	docinto licenses
-	dodoc licenses/* HISTORY
-	docinto examples
-	dodoc example.files/*
-}