old

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index bc106d86ac6fa0264e1abd1a876c4bc474df0aa4..b71b5dd0f810fc3b7c4db78daf3be03f99e63ab4 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 MD5 57673b282c25d0c720a58f6b279abf60 ChangeLog 16014
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 907e88bc8183740775713d4617194f10 util-linux-2.12-r4.ebuild 4100
 MD5 ab12b992dbe050c59d40d4e56f6076c9 util-linux-2.12-r5.ebuild 4199
 MD5 05bbf2629f4d1ab30d95e051cc923add util-linux-2.12i-r1.ebuild 3678
 MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
@@ -17,7 +16,6 @@ MD5 90b5a47385e394b9112357282c35eb4a files/util-linux-2.11z-script.patch 1580
 MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
 MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
-MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r4 154
 MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
 MD5 5a1bf3d383850b6c8ca05cc4fe76c813 files/digest-util-linux-2.12-r5 154
 MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
@@ -37,7 +35,7 @@ MD5 73c0cb6f9aa5fa84e701fc68d0478aac files/util-linux-2.12i-nfsv4.patch 12854
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB4eBVroRuSHgZdywRAsCKAJ9kmLs+LhoagwLZk19a6zEKJIKDOwCfezrv
-ZunWDn6h7mVIq24i83T4BXQ=
-=5XSm
+iD8DBQFB4enyroRuSHgZdywRAszwAJsFzgqU4YrVUIYgDEa1dIPtQV0qDgCdGcdl
+zxib1pR4D2phIX2ByCfmQTA=
+=i53+
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/files/digest-util-linux-2.12-r4 b/sys-apps/util-linux/files/digest-util-linux-2.12-r4
deleted file mode 100644 (file)
index cedffcb..0000000
--- a/sys-apps/util-linux/files/digest-util-linux-2.12-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 997adf78b98d9d1c5db4f37ea982acff util-linux-2.12.tar.gz 1857871
-MD5 1734111e696acfb6d08f52f1e1b3d024 util-linux-2.12-cryptoapi-losetup.patch.bz2 4871

diff --git a/sys-apps/util-linux/util-linux-2.12-r4.ebuild b/sys-apps/util-linux/util-linux-2.12-r4.ebuild
deleted file mode 100644 (file)
index 6f5d693..0000000
--- a/sys-apps/util-linux/util-linux-2.12-r4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12-r4.ebuild,v 1.22 2005/01/10 01:54:02 vapier Exp $
-
-inherit eutils flag-o-matic
-
-CRYPT_PATCH_P="${P}-cryptoapi-losetup"
-SELINUX_PATCH="util-linux-2.12-selinux.diff.bz2"
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.gz
-       ftp://ftp.cwi.nl/pub/aeb/${PN}/${P}.tar.gz
-       crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh"
-IUSE="crypt nls static pam selinux uclibc"
-
-DEPEND="virtual/libc
-       >=sys-libs/ncurses-5.2-r2
-       selinux? ( sys-libs/libselinux )
-       pam? ( sys-apps/pam-login )
-       crypt? ( app-crypt/hashalot )"
-RDEPEND="${DEPEND}
-       dev-lang/perl
-       nls? ( sys-devel/gettext )"
-
-src_unpack() {
-       unpack ${A}
-
-       cd ${S}
-
-       # CryptoAPI losetup patch for the cryptoapi sepecific
-       # to the 2.6 linux kernel. Needs hashalot.
-       # Original patch location:
-       # http://www.stwing.org/~sluskyb/util-linux/losetup-combined.patch
-       # Mailing list post with info:
-       # http://www.kerneli.org/pipermail/cryptoapi-devel/2003-September/000634.html
-       # Follow thread for usage.
-       use crypt && epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
-
-       # Fix rare failures with -j4 or higher
-       epatch ${FILESDIR}/${PN}-2.11z-parallel-make.patch
-
-       # Fix unreadable df output
-       epatch ${FILESDIR}/no-symlink-resolve.patch
-
-       # access() is a macro which uses R_OK however
-       # R_OK is not defined on sparc during a bootstrap 
-       # unless we actually include unistd.h -solar (May 07 2004)
-       epatch ${FILESDIR}/${PN}-2.12-swapon-unistd.patch
-
-       # Add the O option to agetty to display DNS domainname in the issue
-       # file, thanks to Marius Mauch <genone@genone.de>, bug #22275.
-       #
-       # NOTE:  Removing this will break future baselayout, so PLEASE
-       #        consult with me before doing so.
-       #
-       # <azarah@gentoo.og> (17 Jul 2003)
-       epatch ${FILESDIR}/${PN}-2.11z-agetty-domainname-option.patch
-
-       # Add NFS4 support (kernel 2.5/2.6).
-#      if use crypt ; then
-#              epatch ${FILESDIR}/${PN}-2.11z-01-nfsv4-crypt.dif
-#      else
-               epatch ${FILESDIR}/${PN}-2.11z-01-nfsv4.dif
-#      fi
-
-       # <solar@gentoo.org> This patch should allow us to remove -fPIC
-       # out of the filter-flags we need this be able to emit position
-       # independent code so we can link our elf executables as shared
-       # objects. "prelink" should now also be able to take advantage
-       epatch ${FILESDIR}/${PN}-2.11z-pic.patch
-
-       ## see below for details on pic.patch
-       case ${ARCH} in
-               "x86"|"hppa"|"sparc"|"ppc"|"amd64")
-                       ;;
-               *)
-                       filter-flags -fPIC
-                       ;;
-       esac
-
-       # Allow util-linux to compile with 2.6.x headers #31286
-       epatch ${FILESDIR}/${P}-kernel-2.6.patch
-
-       # Add support to read fat/fat32 labels, bug #36722
-       epatch ${FILESDIR}/${P}-fat-LABEL-support.patch
-
-       # Enable pam only if we use it
-       use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG
-
-       use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-
-       sed -i \
-               -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
-               -e "s:CPU=.*:CPU=${CHOST%%-*}:" \
-               -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:" \
-               -e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \
-               MCONFIG || die "MCONFIG sed"
-
-       if ! use nls ; then
-               sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
-                       die "MCONFIG nls sed"
-       fi
-
-       # /bin/kill is provided by procps ONLY
-       epatch ${FILESDIR}/${PN}-no-kill.patch
-
-       use uclibc && sed -e 's/sys_siglist\[sig\]/strsignal(sig)/' -i ${S}/mount/fstab.c
-}
-
-src_compile() {
-       append-ldflags -Wl,-z,now
-       use static && append-ldflags -static
-       export LDFLAGS
-
-       econf || die "configure failed"
-
-       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/*
-}
-