old

(Portage version: 2.2_pre5)

16 files changed, 0 insertions, 1747 deletions

diff --git a/sys-apps/util-linux/files/util-linux-2.11z-01-nfsv4.dif b/sys-apps/util-linux/files/util-linux-2.11z-01-nfsv4.dif
deleted file mode 100644
index 4a60cb0cf338..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.11z-01-nfsv4.dif
+++ /dev/null
@@ -1,475 +0,0 @@
-
-Add support for nfsv4 to mount
-
-
- mount/Makefile     |    4 
- mount/mount.c      |   13 ++
- mount/nfs4_mount.h |   82 +++++++++++++
- mount/nfs4mount.c  |  323 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- mount/sundries.h   |    2 
- 5 files changed, 422 insertions(+), 2 deletions(-)
-
-diff -puN mount/Makefile~nfsv4 mount/Makefile
---- util-linux-2.11z/mount/Makefile~nfsv4	2003-04-23 16:40:57.000000000 -0400
-+++ util-linux-2.11z-bfields/mount/Makefile	2003-04-23 16:40:57.000000000 -0400
-@@ -25,8 +25,8 @@ PROGS = $(SUID_PROGS) $(NOSUID_PROGS)
- MAYBE = pivot_root swapoff
- 
- LO_OBJS = lomount.o $(LIB)/xstrncpy.o
--NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o
--GEN_FILES = nfsmount.h nfsmount_xdr.c nfsmount_clnt.c
-+NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o nfs4mount.o
-+GEN_FILES = nfsmount.h nfsmount_xdr.c nfsmount_clnt.c nfs4mount.c
- 
- all: $(PROGS)
- 
-diff -puN mount/mount.c~nfsv4 mount/mount.c
---- util-linux-2.11z/mount/mount.c~nfsv4	2003-04-23 16:40:57.000000000 -0400
-+++ util-linux-2.11z-bfields/mount/mount.c	2003-04-23 16:40:57.000000000 -0400
-@@ -803,6 +803,19 @@ retry_nfs:
- 	              "without support for the type `nfs'"));
- #endif
-   }
-+#ifdef HAVE_NFS
-+  /*
-+   * NFSv4 support
-+   */
-+  if (!fake && types && streq (types, "nfs4")) {
-+    mnt_err = nfs4mount(spec, node, &flags, &extra_opts, &mount_opts, bg);
-+    if (mnt_err)
-+      return mnt_err;
-+#else
-+    die (EX_SOFTWARE, _("mount: this version was compiled "
-+	              "without support for the type `nfs4'"));
-+#endif
-+  }
- 
-   block_signals (SIG_BLOCK);
- 
-diff -puN /dev/null mount/nfs4_mount.h
---- /dev/null	2003-01-08 17:56:04.000000000 -0500
-+++ util-linux-2.11z-bfields/mount/nfs4_mount.h	2003-04-23 16:40:57.000000000 -0400
-@@ -0,0 +1,82 @@
-+#ifndef _LINUX_NFS4_MOUNT_H
-+#define _LINUX_NFS4_MOUNT_H
-+
-+/*
-+ *  linux/include/linux/nfs4_mount.h
-+ *
-+ *  Copyright (C) 2002  Trond Myklebust
-+ *
-+ *  structure passed from user-space to kernel-space during an nfsv4 mount
-+ */
-+
-+/*
-+ * WARNING!  Do not delete or change the order of these fields.  If
-+ * a new field is required then add it to the end.  The version field
-+ * tracks which fields are present.  This will ensure some measure of
-+ * mount-to-kernel version compatibility.  Some of these aren't used yet
-+ * but here they are anyway.
-+ */
-+#define NFS4_MOUNT_VERSION	1
-+
-+struct nfs_string {
-+	unsigned int len;
-+	const char* data;
-+};
-+
-+struct nfs4_mount_data {
-+	int version;				/* 1 */
-+	int flags;				/* 1 */
-+	int rsize;				/* 1 */
-+	int wsize;				/* 1 */
-+	int timeo;				/* 1 */
-+	int retrans;				/* 1 */
-+	int acregmin;				/* 1 */
-+	int acregmax;				/* 1 */
-+	int acdirmin;				/* 1 */
-+	int acdirmax;				/* 1 */
-+
-+	/* see the definition of 'struct clientaddr4' in RFC3010 */
-+	struct nfs_string client_addr;		/* 1 */
-+
-+	/* Mount path */
-+	struct nfs_string mnt_path;		/* 1 */
-+
-+	/* Server details */
-+	struct nfs_string hostname;		/* 1 */
-+	/* Server IP address */
-+	unsigned int host_addrlen;		/* 1 */
-+	struct sockaddr* host_addr;		/* 1 */
-+
-+	/* Transport protocol to use */
-+	int proto;				/* 1 */
-+
-+	/* Pseudo-flavours to use for authentication. See RFC2623 */
-+	int auth_flavourlen;			/* 1 */
-+	int *auth_flavours;			/* 1 */
-+};
-+
-+/* bits in the flags field */
-+/* Note: the fields that correspond to existing NFSv2/v3 mount options
-+ * 	 should mirror the values from include/linux/nfs_mount.h
-+ */
-+
-+#define NFS4_MOUNT_SOFT		0x0001	/* 1 */
-+#define NFS4_MOUNT_INTR		0x0002	/* 1 */
-+#define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
-+#define NFS4_MOUNT_NOAC		0x0020	/* 1 */
-+#define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
-+#define NFS4_MOUNT_FLAGMASK	0xFFFF
-+
-+/* pseudoflavors: */
-+
-+#define RPC_AUTH_GSS_KRB5       390003
-+#define RPC_AUTH_GSS_KRB5I      390004
-+#define RPC_AUTH_GSS_KRB5P      390005
-+#define RPC_AUTH_GSS_LKEY       390006
-+#define RPC_AUTH_GSS_LKEYI      390007
-+#define RPC_AUTH_GSS_LKEYP      390008
-+#define RPC_AUTH_GSS_SPKM       390009
-+#define RPC_AUTH_GSS_SPKMI      390010
-+#define RPC_AUTH_GSS_SPKMP      390011
-+
-+#endif
-diff -puN /dev/null mount/nfs4mount.c
---- /dev/null	2003-01-08 17:56:04.000000000 -0500
-+++ util-linux-2.11z-bfields/mount/nfs4mount.c	2003-04-23 17:28:54.000000000 -0400
-@@ -0,0 +1,323 @@
-+/*
-+ * nfs4mount.c -- Linux NFS mount
-+ * Copyright (C) 2002 Trond Myklebust <trond.myklebust@fys.uio.no>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * Note: this file based on the original nfsmount.c
-+ */
-+
-+#include "../defines.h"	/* for HAVE_rpcsvc_nfs_prot_h and HAVE_inet_aton */
-+
-+#include <linux/posix_types.h>
-+#include <asm/posix_types.h>
-+#undef __FD_CLR
-+#undef __FD_SET
-+#undef __FD_ISSET
-+#undef __FD_ZERO
-+
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <netdb.h>
-+#include <time.h>
-+#include <sys/socket.h>
-+#include <sys/time.h>
-+#include <sys/utsname.h>
-+#include <sys/stat.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+
-+#include "sundries.h"
-+
-+#include "mount_constants.h"
-+#include "nfs4_mount.h"
-+
-+#include "nls.h"
-+
-+#ifndef NFS_PORT
-+#define NFS_PORT 2049
-+#endif
-+
-+static int parse_devname(char *hostdir, char **hostname, char **dirname)
-+{
-+	char *s;
-+
-+	if (!(s = strchr(hostdir, ':'))) {
-+		fprintf(stderr,
-+			_("mount: "
-+			  "directory to mount not in host:dir format\n"));
-+		return -1;
-+	}
-+	*hostname = hostdir;
-+	*dirname = s + 1;
-+	*s = '\0';
-+	/* Ignore all but first hostname in replicated mounts
-+	   until they can be fully supported. (mack@sgi.com) */
-+	if ((s = strchr(hostdir, ','))) {
-+		*s = '\0';
-+		fprintf(stderr,
-+			_("mount: warning: "
-+			  "multiple hostnames not supported\n"));
-+	}
-+	return 0;
-+}
-+
-+static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
-+{
-+	struct hostent *hp;
-+	addr->sin_family = AF_INET;
-+
-+	if (inet_aton(hostname, &addr->sin_addr))
-+		return 0;
-+	if ((hp = gethostbyname(hostname)) == NULL) {
-+		fprintf(stderr, _("mount: can't get address for %s\n"),
-+			hostname);
-+		return -1;
-+	}
-+	if (hp->h_length > sizeof(struct in_addr)) {
-+		fprintf(stderr,
-+			_("mount: got bad hp->h_length\n"));
-+		hp->h_length = sizeof(struct in_addr);
-+	}
-+	memcpy(&addr->sin_addr, hp->h_addr, hp->h_length);
-+	return 0;
-+}
-+
-+static int get_my_ipv4addr(char *ip_addr, int len)
-+{
-+	char myname[1024];
-+	struct sockaddr_in myaddr;
-+
-+	if (gethostname(myname, sizeof(myname))) {
-+		fprintf(stderr, _("mount: can't determine client address\n"));
-+		return -1;
-+	}
-+	if (fill_ipv4_sockaddr(myname, &myaddr))
-+		return -1;
-+	snprintf(ip_addr, len, "%s", inet_ntoa(myaddr.sin_addr));
-+	ip_addr[len-1] = '\0';
-+	return 0;
-+}
-+
-+int nfs4mount(const char *spec, const char *node, int *flags,
-+	      char **extra_opts, char **mount_opts,
-+	      int running_bg)
-+{
-+	static struct nfs4_mount_data data;
-+	static char hostdir[1024];
-+	static char ip_addr[16] = "127.0.0.1";
-+	static struct sockaddr_in server_addr;
-+	static int pseudoflavour = 0;
-+
-+	char *hostname, *dirname, *old_opts;
-+	char new_opts[1024];
-+	char *opt, *opteq;
-+	char *s;
-+	int val;
-+	int port, bg, soft, intr;
-+	int nocto, noac;
-+	int retry;
-+	int retval;
-+
-+	retval = EX_FAIL;
-+	if (strlen(spec) >= sizeof(hostdir)) {
-+		fprintf(stderr, _("mount: "
-+				  "excessively long host:dir argument\n"));
-+		goto fail;
-+	}
-+	strcpy(hostdir, spec);
-+	if (parse_devname(hostdir, &hostname, &dirname))
-+		goto fail;
-+
-+	if (fill_ipv4_sockaddr(hostname, &server_addr))
-+		goto fail;
-+	if (get_my_ipv4addr(ip_addr, sizeof(ip_addr)))
-+		goto fail;
-+
-+	/* add IP address to mtab options for use when unmounting */
-+	s = inet_ntoa(server_addr.sin_addr);
-+	old_opts = *extra_opts;
-+	if (!old_opts)
-+		old_opts = "";
-+	if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) {
-+		fprintf(stderr, _("mount: "
-+				  "excessively long option argument\n"));
-+		goto fail;
-+	}
-+	snprintf(new_opts, sizeof(new_opts), "%s%saddr=%s",
-+		 old_opts, *old_opts ? "," : "", s);
-+	*extra_opts = xstrdup(new_opts);
-+
-+	/* Set default options.
-+	 * rsize/wsize and timeo are left 0 in order to
-+	 * let the kernel decide.
-+	 */
-+	memset(&data, 0, sizeof(data));
-+	data.retrans	= 3;
-+	data.acregmin	= 3;
-+	data.acregmax	= 60;
-+	data.acdirmin	= 30;
-+	data.acdirmax	= 60;
-+	data.proto	= IPPROTO_TCP;
-+
-+	bg = 0;
-+	soft = 0;
-+	intr = 0;
-+	nocto = 0;
-+	noac = 0;
-+	retry = 10000;		/* 10000 minutes ~ 1 week */
-+
-+	/*
-+	 * NFSv4 specifies that the default port should be 2049
-+	 */
-+	port = NFS_PORT;
-+
-+	/* parse options */
-+
-+	for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) {
-+		if ((opteq = strchr(opt, '='))) {
-+			val = atoi(opteq + 1);	
-+			*opteq = '\0';
-+			if (!strcmp(opt, "rsize"))
-+				data.rsize = val;
-+			else if (!strcmp(opt, "wsize"))
-+				data.wsize = val;
-+			else if (!strcmp(opt, "timeo"))
-+				data.timeo = val;
-+			else if (!strcmp(opt, "retrans"))
-+				data.retrans = val;
-+			else if (!strcmp(opt, "acregmin"))
-+				data.acregmin = val;
-+			else if (!strcmp(opt, "acregmax"))
-+				data.acregmax = val;
-+			else if (!strcmp(opt, "acdirmin"))
-+				data.acdirmin = val;
-+			else if (!strcmp(opt, "acdirmax"))
-+				data.acdirmax = val;
-+			else if (!strcmp(opt, "actimeo")) {
-+				data.acregmin = val;
-+				data.acregmax = val;
-+				data.acdirmin = val;
-+				data.acdirmax = val;
-+			}
-+			else if (!strcmp(opt, "retry"))
-+				retry = val;
-+			else if (!strcmp(opt, "port"))
-+				port = val;
-+			else if (!strcmp(opt, "proto")) {
-+				if (!strncmp(opteq+1, "tcp", 3))
-+					data.proto = IPPROTO_TCP;
-+				else if (!strncmp(opteq+1, "udp", 3))
-+					data.proto = IPPROTO_UDP;
-+				else
-+					printf(_("Warning: Unrecognized proto= option.\n"));
-+			} else if (!strcmp(opt, "clientaddr")) {
-+				if (strlen(opteq+1) >= sizeof(ip_addr))
-+					printf(_("Invalid client address %s"),
-+								opteq+1);
-+				strncpy(ip_addr,opteq+1, sizeof(ip_addr));
-+				ip_addr[sizeof(ip_addr)-1] = '\0';
-+			} else if (!strcmp(opt, "sec")) {
-+				if (!strncmp(opteq+1, "krb5i",5))
-+					pseudoflavour = 390004;
-+				else if (!strncmp(opteq+1, "krb5p",5))
-+					pseudoflavour = 390005;
-+				else if (!strncmp(opteq+1, "krb5",4))
-+					pseudoflavour = 390003;
-+				else {
-+					printf(_("unknown security type %s\n"),
-+							opteq+1);
-+					goto fail;
-+				}
-+			} else if (!strcmp(opt, "addr")) {
-+				/* ignore */;
-+			} else {
-+				printf(_("unknown nfs mount parameter: "
-+					 "%s=%d\n"), opt, val);
-+				goto fail;
-+			}
-+		} else {
-+			val = 1;
-+			if (!strncmp(opt, "no", 2)) {
-+				val = 0;
-+				opt += 2;
-+			}
-+			if (!strcmp(opt, "bg")) 
-+				bg = val;
-+			else if (!strcmp(opt, "fg")) 
-+				bg = !val;
-+			else if (!strcmp(opt, "soft"))
-+				soft = val;
-+			else if (!strcmp(opt, "hard"))
-+				soft = !val;
-+			else if (!strcmp(opt, "intr"))
-+				intr = val;
-+			else if (!strcmp(opt, "cto"))
-+				nocto = !val;
-+			else if (!strcmp(opt, "ac"))
-+				noac = !val;
-+			else {
-+				if (!sloppy) {
-+					printf(_("unknown nfs mount option: "
-+						 "%s%s\n"), val ? "" : "no", opt);
-+					goto fail;
-+				}
-+			}
-+		}
-+	}
-+
-+	data.flags = (soft ? NFS4_MOUNT_SOFT : 0)
-+		| (intr ? NFS4_MOUNT_INTR : 0)
-+		| (nocto ? NFS4_MOUNT_NOCTO : 0)
-+		| (noac ? NFS4_MOUNT_NOAC : 0);
-+
-+	if (pseudoflavour != 0) {
-+		data.auth_flavourlen = 1;
-+		data.auth_flavours = &pseudoflavour;
-+	}
-+
-+	data.client_addr.data = ip_addr;
-+	data.client_addr.len = strlen(ip_addr);
-+
-+	data.mnt_path.data = dirname;
-+	data.mnt_path.len = strlen(dirname);
-+
-+	data.hostname.data = hostname;
-+	data.hostname.len = strlen(hostname);
-+	data.host_addr = (struct sockaddr *)&server_addr;
-+	data.host_addrlen = sizeof(server_addr);
-+
-+#ifdef NFS_MOUNT_DEBUG
-+	printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n",
-+	       data.rsize, data.wsize, data.timeo, data.retrans);
-+	printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n",
-+	       data.acregmin, data.acregmax, data.acdirmin, data.acdirmax);
-+	printf("port = %d, bg = %d, retry = %d, flags = %.8x\n",
-+	       port, bg, retry, data.flags);
-+	printf("soft = %d, intr = %d, nocto = %d, noac = %d\n",
-+	       (data.flags & NFS4_MOUNT_SOFT) != 0,
-+	       (data.flags & NFS4_MOUNT_INTR) != 0,
-+	       (data.flags & NFS4_MOUNT_NOCTO) != 0,
-+	       (data.flags & NFS4_MOUNT_NOAC) != 0);
-+	printf("proto = %s\n", (data.proto == IPPROTO_TCP) ? "tcp" : "udp");
-+#endif
-+
-+	data.version = NFS4_MOUNT_VERSION;
-+
-+	*mount_opts = (char *) &data;
-+	/* clean up */
-+	return 0;
-+
-+fail:
-+	return retval;
-+}
-diff -puN mount/sundries.h~nfsv4 mount/sundries.h
---- util-linux-2.11z/mount/sundries.h~nfsv4	2003-04-23 16:40:57.000000000 -0400
-+++ util-linux-2.11z-bfields/mount/sundries.h	2003-04-23 16:40:57.000000000 -0400
-@@ -37,6 +37,8 @@ void die (int errcode, const char *fmt, 
- #ifdef HAVE_NFS
- int nfsmount (const char *spec, const char *node, int *flags,
- 	      char **orig_opts, char **opt_args, int *version, int running_bg);
-+int nfs4mount (const char *spec, const char *node, int *flags,
-+	       char **orig_opts, char **opt_args, int running_bg);
- #endif
- 
- /* exit status - bits below are ORed */
-
-_
diff --git a/sys-apps/util-linux/files/util-linux-2.11z-pic.patch b/sys-apps/util-linux/files/util-linux-2.11z-pic.patch
deleted file mode 100644
index 53c5089d8aa1..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.11z-pic.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -u -r -N util-linux-2.11z.orig/fdisk/llseek.c util-linux-2.11z/fdisk/llseek.c
---- util-linux-2.11z.orig/fdisk/llseek.c	2002-10-31 14:44:31.000000000 +0100
-+++ util-linux-2.11z/fdisk/llseek.c	2003-07-12 19:08:59.000000000 +0200
-@@ -3,6 +3,9 @@
-  *
-  * Copyright (C) 1994 Remy Card.  This file may be redistributed
-  * under the terms of the GNU Public License.
-+ *
-+ * Changes:
-+ * 20030712 - Alexander Gabert <pappy@nikita.ath.cx> - adding PIC defines
-  */
- 
- #include <sys/types.h>
-@@ -25,7 +28,8 @@
- 
- #else	/* HAVE_LLSEEK */
- 
--#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
-+/* do not use assembler to put together syscalls at compile time (for llseek for example) when using PIC */
-+#if defined(__PIC__) || defined(__pic__) || defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
- 
- #define my_llseek lseek
- 
-diff -u -r -N util-linux-2.11z.orig/fdisk/sfdisk.c util-linux-2.11z/fdisk/sfdisk.c
---- util-linux-2.11z.orig/fdisk/sfdisk.c	2003-01-28 19:18:03.000000000 +0100
-+++ util-linux-2.11z/fdisk/sfdisk.c	2003-07-12 19:08:38.000000000 +0200
-@@ -28,6 +28,7 @@
-  *
-  * Changes:
-  * 19990319 - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - i18n
-+ * 20030712 - Alexander Gabert <pappy@nikita.ath.cx> - adding PIC defines
-  */
- 
- #define PROGNAME "sfdisk"
-@@ -130,7 +131,9 @@
-  *
-  * Note: we use 512-byte sectors here, irrespective of the hardware ss.
-  */
--#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__)
-+
-+/* do not use the assembler constructed syscalls for seeking if compiled as PIC */
-+#if !defined(__PIC__) && !defined(__pic__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__)
- static
- _syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo,
-        loff_t *, res, uint, wh);
-@@ -142,7 +145,7 @@
-     in = ((loff_t) s << 9);
-     out = 1;
- 
--#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__)
-+#if !defined(__PIC__) && !defined(__pic__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__)
-     if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) {
- #else
-     if ((out = lseek(fd, in, SEEK_SET)) != in) {
-diff -u -r -N util-linux-2.11z.orig/mount/pivot_root.c util-linux-2.11z/mount/pivot_root.c
---- util-linux-2.11z.orig/mount/pivot_root.c	2002-11-29 12:02:56.000000000 +0100
-+++ util-linux-2.11z/mount/pivot_root.c	2003-07-12 19:07:39.000000000 +0200
-@@ -1,12 +1,17 @@
- /* pivot_root.c - Change the root file system */
- 
- /* Written 2000 by Werner Almesberger */
-+/*
-+ * Jul 11 2003 <solar@gentoo.org>
-+ * avoid using assembler constructed _syscall2() when PIC is needed
-+ */
- 
- #include <stdio.h>
- #include <errno.h>	/* needed for <linux/unistd.h> below */
- 
--#ifdef __ia64__
-+#if (defined(__ia64__) || defined(__PIC__) || defined(__pic__))
- # include <sys/syscall.h>
-+# include <unistd.h>
- # define pivot_root(new_root,put_old) syscall(SYS_pivot_root,new_root,put_old)
- #else
- # include <linux/unistd.h>
diff --git a/sys-apps/util-linux/files/util-linux-2.12-fat-LABEL-support.patch b/sys-apps/util-linux/files/util-linux-2.12-fat-LABEL-support.patch
deleted file mode 100644
index 0099bbf0a864..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12-fat-LABEL-support.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-diff -uNr util-linux-2.12/mount/get_label_uuid.c ../patch/util-linux-2.12/mount/get_label_uuid.c
---- util-linux-2.12/mount/get_label_uuid.c	2002-11-26 12:18:01.000000000 +0100
-+++ ../patch/util-linux-2.12/mount/get_label_uuid.c	2003-10-20 18:27:56.000000000 +0200
-@@ -43,7 +43,139 @@
- #endif
- }
- 
--/* for now, only ext2, ext3, xfs, ocfs are supported */
-+/* Remove trailing spaces */
-+static void remtrailspc(char *label) {
-+    char *c;
-+
-+    c = strchr(label, 0)-1;
-+    while (c >= label && *c == ' ')
-+        *(c--) = 0;
-+}
-+
-+static int handle_fat_dirent(struct fat_dirent *dirent, char **label) {
-+    size_t namesize;
-+    
-+    /* end-of-directory marker */
-+    if (!dirent->s_filename[0])
-+        return -1;
-+
-+    /* valid volume label */
-+    if ((dirent->s_attr == 0x08 || dirent->s_attr == 0x28) && dirent->s_filename[0] != 0xe5) {
-+        
-+        /* sanity check */
-+        if (dirent->s_size[0] || dirent->s_size[1] || dirent->s_size[2] || dirent->s_size[3] ||
-+            dirent->s_cluster[0] || dirent->s_cluster[1])
-+            return -1;
-+            
-+        namesize = sizeof(dirent->s_filename);
-+        if (!(*label = calloc(namesize + 1, 1)))
-+            return -1;
-+        memcpy(*label, dirent->s_filename, namesize);
-+        (*label)[namesize] = 0;
-+        remtrailspc(*label);
-+        
-+        return 0;
-+    }
-+
-+    return 1;
-+}
-+
-+static int read_volume_label_fat(int fd, struct fat_super_block *fatsb, char **label) {
-+    unsigned i, m;
-+    off_t o;
-+
-+    m = assemble2le(fatsb->s_dirents);   /* root directory entries */  
-+
-+    o = (off_t) assemble2le(fatsb->s_ssec) *     /* bytes per sector */
-+        ((off_t) assemble2le(fatsb->s_rsecs) +   /* reserved sectors */
-+         (off_t) assemble2le(fatsb->s_spfat) *   /* sectors per fat */
-+         (off_t) fatsb->s_nfats);                /* number of fats */ 
-+    
-+    for (i = 0; i < m; i++) {
-+        struct fat_dirent dirent;
-+        int rv;
-+
-+        if (lseek(fd, o, SEEK_SET) != o ||
-+            read(fd, &dirent, sizeof(dirent)) != sizeof(dirent))
-+            return -1;
-+
-+        if ((rv = handle_fat_dirent(&dirent, label)) != 1)
-+            return rv;
-+        
-+        o += sizeof(dirent);
-+    }
-+    
-+    return -1;
-+}
-+
-+static int read_volume_label_fat32(int fd, struct fat32_super_block *fat32sb, char **label) {
-+    unsigned c;
-+    off_t fo, b, o;
-+    int i, ifat;
-+    size_t m, cs;
-+    
-+    ifat = fat32sb->s_mirror[0] & 128 ? (fat32sb->s_mirror[0] & 0xF) : 0;
-+
-+    if (ifat >= fat32sb->s_nfats)
-+        return -1;
-+    
-+    fo = (off_t) assemble2le(fat32sb->s_ssec) *    /* bytes per sector */
-+        ((off_t) assemble2le(fat32sb->s_rsecs) +   /* reserved sectors */
-+         (off_t) assemble4le(fat32sb->s_spfat) *   /* sectors per fat */
-+         (off_t) ifat);                            /* number of FAT used */
-+
-+    b = (off_t) assemble2le(fat32sb->s_ssec) *     /* bytes per sector */
-+        ((off_t) assemble2le(fat32sb->s_rsecs) +   /* reserved sectors */
-+         (off_t) assemble4le(fat32sb->s_spfat) *   /* sectors per fat */
-+         (off_t) fat32sb->s_nfats);                /* number of FATs */
-+
-+    c = assemble4le(fat32sb->s_rcluster) & 0x0fffffffL;
-+    if (c < 2 || c >= 0x0ffffff0)
-+        return -1;
-+
-+    m = cs = assemble2le(fat32sb->s_ssec) * (size_t) fat32sb->s_scluster;
-+    o = b + (off_t) cs*(c-2);
-+
-+    for (i = 0; i < 0xFFFF; i++) { /* safety against DoS attack */
-+        struct fat_dirent dirent;
-+        int rv;
-+
-+        if (lseek(fd, o, SEEK_SET) != o ||
-+            read(fd, &dirent, sizeof(dirent)) != sizeof(dirent))
-+            return -1;
-+
-+        if ((rv = handle_fat_dirent(&dirent, label)) != 1)
-+            return rv;
-+        
-+        if (m > sizeof(dirent)) {
-+            m -= sizeof(dirent);
-+            o += sizeof(dirent);
-+        } else {
-+            off_t d;
-+
-+            /* next cluster */
-+            
-+            d = fo+4*c;
-+            if (lseek(fd, d, SEEK_SET) != d ||
-+                read(fd, &c, 4) != 4)
-+                return -1;
-+
-+            c = assemble4le((char*) &c) & 0x0fffffffL;
-+            if (c < 2 || c >= 0x0ffffff0) {
-+                return -1;
-+            }
-+
-+            m = cs;
-+            o = b + cs*(c-2);
-+        }
-+    }
-+    
-+    
-+    return -1;
-+}
-+
-+
-+/* for now, only ext2, ext3, xfs, ocfs, fat, fat32 are supported */
- int
- get_label_uuid(const char *device, char **label, char *uuid) {
- 	int fd;
-@@ -54,8 +186,10 @@
- 	struct jfs_super_block jfssb;
- 	struct ocfs_volume_header ovh;	/* Oracle */
- 	struct ocfs_volume_label olbl;
-+        struct fat_super_block fatsb;
-+        struct fat32_super_block fat32sb;
- 
--	fd = open(device, O_RDONLY);
-+        fd = open(device, O_RDONLY);
- 	if (fd < 0)
- 		return rv;
- 
-@@ -111,7 +245,87 @@
- 			    memcpy(*label, jfssb.s_label, namesize);
- 		}
- 		rv = 0;
--	}
-+        } else if (lseek(fd, 0, SEEK_SET) == 0
-+                   && read(fd, (char*) &fat32sb, sizeof(fat32sb)) == sizeof(fat32sb)
-+                   && fat32sb.s_sig[0] == 0x55
-+                   && fat32sb.s_sig[1] == 0xAA
-+                   && (fat32sb.s_media & 0xF0) == 0xF0
-+                   && (fat32sb.s_spfat_old[0] == 0)
-+                   && (fat32sb.s_spfat_old[1] == 0)
-+                   && fat32sb.s_extsig == 0x29
-+                   && (memcmp(fat32sb.s_fs, "FAT32   ", 8) == 0)) {
-+
-+            *label = NULL;
-+
-+            /* If no root directory entry volume name was found use the one from the boot sector */
-+            if (read_volume_label_fat32(fd, &fat32sb, label) != 0) {
-+                if (memcmp(fat32sb.s_label, "NO NAME    ", 11) != 0 &&
-+                    memcmp(fat32sb.s_label, "           ", 11) != 0 &&
-+                    memcmp(fat32sb.s_label, "\0\0\0\0\0\0\0\0", 8) != 0) {
-+                    
-+                    namesize = sizeof(fat32sb.s_label);
-+                    if ((*label = calloc(namesize + 1, 1)) != NULL) {
-+                        memcpy(*label, fat32sb.s_label, namesize);
-+                        (*label)[namesize] = 0;
-+                        remtrailspc(*label);
-+                    }
-+                }
-+            }
-+
-+            if (*label) {
-+                
-+                /* Set UUID from serial */
-+                uuid[0] = fat32sb.s_serial[3];
-+                uuid[1] = fat32sb.s_serial[2];
-+                uuid[2] = fat32sb.s_serial[1];
-+                uuid[3] = fat32sb.s_serial[0];
-+                memset(uuid+4, 0, 12);
-+                
-+                rv = 0;
-+            }
-+	} else if (lseek(fd, 0, SEEK_SET) == 0
-+                   && read(fd, (char*) &fatsb, sizeof(fatsb)) == sizeof(fatsb)
-+                   && fatsb.s_sig[0] == 0x55
-+                   && fatsb.s_sig[1] == 0xAA
-+                   && (fatsb.s_media & 0xF0) == 0xF0
-+                   && fatsb.s_extsig == 0x29
-+                   && (memcmp(fatsb.s_fs, "FAT12   ", 8) == 0
-+                       || memcmp(fatsb.s_fs, "FAT16   ", 8) == 0
-+                       || memcmp(fatsb.s_fs, "FAT     ", 8) == 0
-+                       || memcmp(fatsb.s_fs, "\0\0\0\0\0\0\0\0", 8) == 0)
-+                   && memcmp(fatsb.s_fs2, "FAT32   ", 8) != 0) {
-+
-+            *label = NULL;
-+            
-+            if (read_volume_label_fat(fd, &fatsb, label) != 0) {
-+
-+                /* If no root directory entry volume name was found use the one from the boot sector */
-+                if (memcmp(fatsb.s_label, "NO NAME    ", 11) != 0 &&
-+                    memcmp(fatsb.s_label, "           ", 11) != 0 &&
-+                    memcmp(fatsb.s_label, "\0\0\0\0\0\0\0\0", 8) != 0) {
-+                    
-+                    namesize = sizeof(fatsb.s_label);
-+                    if ((*label = calloc(namesize + 1, 1)) != NULL) {
-+                        memcpy(*label, fatsb.s_label, namesize);
-+                        (*label)[namesize] = 0;
-+                        remtrailspc(*label);
-+                    }
-+
-+                }
-+            }
-+
-+            if (*label) {
-+
-+                /* Set UUID from serial */
-+                uuid[0] = fatsb.s_serial[3];
-+                uuid[1] = fatsb.s_serial[2];
-+                uuid[2] = fatsb.s_serial[1];
-+                uuid[3] = fatsb.s_serial[0];
-+                memset(uuid+4, 0, 12);
-+                
-+                rv = 0;
-+            }
-+        }
- 
- 	close(fd);
- 	return rv;
-diff -uNr util-linux-2.12/mount/linux_fs.h ../patch/util-linux-2.12/mount/linux_fs.h
---- util-linux-2.12/mount/linux_fs.h	2003-07-05 22:16:32.000000000 +0200
-+++ ../patch/util-linux-2.12/mount/linux_fs.h	2003-10-20 18:07:06.000000000 +0200
-@@ -122,13 +122,65 @@
-     u_char    s_dummy[3];
-     u_char    s_os[8];		/* "MSDOS5.0" or "MSWIN4.0" or "MSWIN4.1" */
- 				/* mtools-3.9.4 writes "MTOOL394" */
--    u_char    s_dummy2[32];
-+    u_char    s_ssec[2];        /* bytes per sector */
-+    u_char    s_scluster;       /* sectors per cluster */
-+    u_char    s_rsecs[2];       /* reserved sectors */
-+    u_char    s_nfats;          /* number of FATs */
-+    u_char    s_dirents[2];     /* maximum root directory entries */
-+    u_char    s_nsecs[2];       /* total number of sectors */
-+    u_char    s_media;          /* media type, upper nibble is 0xF */
-+    u_char    s_spfat[2];       /* sectors per fat */
-+
-+    u_char    s_dummy2[14];
-+    u_char    s_extsig;         /* extended signature */
-+    u_char    s_serial[4];      /* serial number */
-     u_char    s_label[11];	/* for DOS? */
--    u_char    s_fs[8];		/* "FAT12   " or "FAT16   " or all zero   */
-+    u_char    s_fs[8];	        /* "FAT12   " or "FAT16   " or all zero   */
-                                 /* OS/2 BM has "FAT     " here. */
--    u_char    s_dummy3[9];
--    u_char    s_label2[11];	/* for Windows? */
--    u_char    s_fs2[8];	        /* garbage or "FAT32   " */
-+
-+    u_char    s_dummy3[20];
-+    u_char    s_fs2[8];         /* "FAT32   " */
-+
-+    u_char    s_dummy4[420];
-+    u_char    s_sig[2];         /* 55 AA */
-+};
-+
-+struct fat32_super_block {
-+    u_char    s_dummy[3];
-+    u_char    s_os[8];		/* "MSDOS5.0" or "MSWIN4.0" or "MSWIN4.1" */
-+				/* mtools-3.9.4 writes "MTOOL394" */
-+
-+    u_char    s_ssec[2];        /* bytes per sector */
-+    u_char    s_scluster;       /* sectors per cluster */
-+    u_char    s_rsecs[2];       /* reserved sectors */
-+    u_char    s_nfats;          /* number of FATs */
-+    u_char    s_dirents[2];     /* maximum root directory entries */
-+    u_char    s_nsecs[2];       /* total number of sectors */
-+    u_char    s_media;          /* media type, upper nibble is 0xF */
-+    u_char    s_spfat_old[2];   /* sectors per fat */
-+
-+    u_char    s_dummy2[12];
-+    u_char    s_spfat[4];       /* sectors per FAT */
-+    u_char    s_mirror[2];      /* mirror flag */
-+    u_char    s_version[2];     /* fs version */
-+    u_char    s_rcluster[4];    /* root directory cluster */
-+
-+    u_char    s_dummy3[18];
-+    u_char    s_extsig;         /* extended signature 0x29 */
-+    u_char    s_serial[4];      /* serial number */
-+    u_char    s_label[11];      /* label */
-+    u_char    s_fs[8];          /* filesystem type "FAT32   " */
-+
-+    u_char    s_dummy4[420];
-+    u_char    s_sig[2];         /* 55 AA */
-+};
-+
-+struct fat_dirent {
-+    u_char    s_filename[11];   /* Filename with extension */
-+    u_char    s_attr;           /* File attribute flags */
-+    u_char    s_dummy[14];   
-+    u_char    s_cluster[2];     /* Starting cluster */
-+    u_char    s_size[4];        /* File size */
- };
- 
- #define XFS_SUPER_MAGIC "XFSB"
diff --git a/sys-apps/util-linux/files/util-linux-2.12-gcloop.patch b/sys-apps/util-linux/files/util-linux-2.12-gcloop.patch
deleted file mode 100644
index 97be88c07b2c..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12-gcloop.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -ruN util-linux-2.12.orig/mount/lomount.c util-linux-2.12/mount/lomount.c
---- util-linux-2.12.orig/mount/lomount.c	2004-02-17 02:08:05.341716624 +0100
-+++ util-linux-2.12/mount/lomount.c	2004-02-17 02:12:10.653423576 +0100
-@@ -60,7 +60,8 @@
-         info->lo_flags = info64->lo_flags;
-         info->lo_init[0] = info64->lo_init[0];
-         info->lo_init[1] = info64->lo_init[1];
--        if (info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI)
-+        if ((info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI) ||
-+		(info->lo_encrypt_type == LO_CRYPT_COMPRESS))
-                 memcpy(info->lo_name, info64->lo_crypt_name, LO_NAME_SIZE);
-         else
-                 memcpy(info->lo_name, info64->lo_file_name, LO_NAME_SIZE);
-@@ -321,7 +322,8 @@
- 
- int
- set_loop(const char *device, const char *file, int offset,
--	 const char *encryption, int pfd, int *loopro) {
-+	 const char *encnumber,const char *encryption,
-+	 int pfd, int *loopro) {
- 	struct loop_info64 loopinfo64;
- 	int fd, ffd, mode;
- 	char *pass;
-@@ -344,8 +346,9 @@
- 	memset(&loopinfo64, 0, sizeof(loopinfo64));
- 
- 	xstrncpy(loopinfo64.lo_file_name, file, LO_NAME_SIZE);
--
-+			
- 	if (encryption && *encryption) {
-+
- 		if (digits_only(encryption)) {
- 			loopinfo64.lo_encrypt_type = atoi(encryption);
- 		} else {
-@@ -386,6 +389,12 @@
- 		}
- 	}
- 
-+	if (encnumber && *encnumber) {
-+
-+		if (digits_only(encnumber))
-+			loopinfo64.lo_encrypt_type = atoi(encnumber);
-+	}
-+
- 	loopinfo64.lo_offset = offset;
- 
- #ifdef MCL_FUTURE  
-@@ -601,7 +610,7 @@
- 
- int
- main(int argc, char **argv) {
--	char *offset, *encryption, *passfd;
-+	char *offset, *encryption, *encnumber, *passfd;
- 	int delete, off, c;
- 	int res = 0;
- 	int ro = 0;
-@@ -612,7 +621,7 @@
- 	textdomain(PACKAGE);
- 
- 	delete = off = 0;
--	offset = encryption = passfd = NULL;
-+	offset = encryption = encnumber = passfd = NULL;
- 	progname = argv[0];
- 	while ((c = getopt(argc,argv,"de:E:o:p:v")) != -1) {
- 		switch (c) {
-@@ -620,6 +629,7 @@
- 			delete = 1;
- 			break;
- 		case 'E':
-+			encnumber = optarg;
- 		case 'e':
- 			encryption = optarg;
- 			break;
-@@ -651,7 +661,7 @@
- 		if (passfd && sscanf(passfd,"%d",&pfd) != 1)
- 			usage();
- 		res = set_loop(argv[optind], argv[optind+1], off,
--			       encryption, pfd, &ro);
-+				encnumber, encryption, pfd, &ro);
- 	}
- 	return res;
- }
-diff -ruN util-linux-2.12.orig/mount/lomount.h util-linux-2.12/mount/lomount.h
---- util-linux-2.12.orig/mount/lomount.h	2004-02-17 02:08:05.339716928 +0100
-+++ util-linux-2.12/mount/lomount.h	2004-02-17 02:08:14.921260312 +0100
-@@ -1,6 +1,6 @@
- extern int verbose;
- extern int set_loop(const char *, const char *, int, const char *,
--		    int, int *);
-+		    const char *, int, int *);
- extern int del_loop(const char *);
- extern int is_loop_device(const char *);
- extern char * find_unused_loop_device(void);
-diff -ruN util-linux-2.12.orig/mount/loop.h util-linux-2.12/mount/loop.h
---- util-linux-2.12.orig/mount/loop.h	2004-02-17 02:08:05.341716624 +0100
-+++ util-linux-2.12/mount/loop.h	2004-02-17 02:08:14.922260160 +0100
-@@ -2,6 +2,7 @@
- #define LO_CRYPT_XOR	1
- #define LO_CRYPT_DES	2
- #define LO_CRYPT_CRYPTOAPI 18
-+#define LO_CRYPT_COMPRESS  19
- 
- #define LOOP_SET_FD		0x4C00
- #define LOOP_CLR_FD		0x4C01
-diff -ruN util-linux-2.12.orig/mount/mount.c util-linux-2.12/mount/mount.c
---- util-linux-2.12.orig/mount/mount.c	2004-02-17 02:08:05.281725744 +0100
-+++ util-linux-2.12/mount/mount.c	2004-02-17 02:08:14.924259856 +0100
-@@ -612,7 +612,7 @@
-       offset = opt_offset ? strtoul(opt_offset, NULL, 0) : 0;
-       if (opt_keygen)
- 	pfd = use_keygen_prog(opt_keygen, keygen_args, _n_keygen_args);
--      if (set_loop(*loopdev, *loopfile, offset,
-+      if (set_loop(*loopdev, *loopfile, offset, NULL,
- 		   opt_encryption, pfd, &loopro)) {
- 	if (verbose)
- 	  printf(_("mount: failed setting up loop device\n"));
diff --git a/sys-apps/util-linux/files/util-linux-2.12-kernel-2.6.patch b/sys-apps/util-linux/files/util-linux-2.12-kernel-2.6.patch
deleted file mode 100644
index 3f03c5568f4a..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12-kernel-2.6.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ruN util-linux-2.12.orig/disk-utils/blockdev.c util-linux-2.12/disk-utils/blockdev.c
---- util-linux-2.12.orig/disk-utils/blockdev.c	2002-03-08 23:57:02.000000000 +0100
-+++ util-linux-2.12/disk-utils/blockdev.c	2003-10-16 18:26:53.048373136 +0200
-@@ -9,6 +9,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#include <linux/version.h>
- 
- #include "nls.h"
- 
-@@ -24,8 +25,13 @@
- #define BLKRASET   _IO(0x12,98)
- #define BLKRAGET   _IO(0x12,99)
- #define BLKSSZGET  _IO(0x12,104)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
- #define BLKBSZGET  _IOR(0x12,112,sizeof(int))
- #define BLKBSZSET  _IOW(0x12,113,sizeof(int))
-+#else
-+#define BLKBSZGET  _IOR(0x12,112,int)
-+#define BLKBSZSET  _IOW(0x12,113,int)
-+#endif
- #endif
- 
- /* Maybe <linux/hdreg.h> could be included */
-diff -ruN util-linux-2.12.orig/disk-utils/elvtune.c util-linux-2.12/disk-utils/elvtune.c
---- util-linux-2.12.orig/disk-utils/elvtune.c	2002-03-08 23:57:49.000000000 +0100
-+++ util-linux-2.12/disk-utils/elvtune.c	2003-10-16 18:26:53.048373136 +0200
-@@ -26,6 +26,8 @@
- #include <sys/ioctl.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <linux/version.h>
-+
- #include "nls.h"
- 
- /* this has to match with the kernel structure */
-@@ -37,8 +39,13 @@
- 	int max_bomb_segments;
- } blkelv_ioctl_arg_t;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
- #define BLKELVGET   _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
- #define BLKELVSET   _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
-+#else
-+#define BLKELVGET   _IOR(0x12,106,blkelv_ioctl_arg_t)
-+#define BLKELVSET   _IOW(0x12,107,blkelv_ioctl_arg_t)
-+#endif
- 
- static void
- usage(void) {
-diff -ruN util-linux-2.12.orig/fdisk/common.h util-linux-2.12/fdisk/common.h
---- util-linux-2.12.orig/fdisk/common.h	2003-07-13 15:59:53.000000000 +0200
-+++ util-linux-2.12/fdisk/common.h	2003-10-16 18:29:11.365345760 +0200
-@@ -2,11 +2,18 @@
- 
- /* including <linux/fs.h> fails */
- #include <sys/ioctl.h>
-+#include <linux/version.h>
-+
- #define BLKRRPART    _IO(0x12,95)    /* re-read partition table */
- #define BLKGETSIZE   _IO(0x12,96)    /* return device size */
- #define BLKFLSBUF    _IO(0x12,97)    /* flush buffer cache */
- #define BLKSSZGET    _IO(0x12,104)   /* get block device sector size */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
- #define BLKGETSIZE64 _IOR(0x12,114,8)	/* 8 = sizeof(u64) */
-+#else
-+#define BLKGETSIZE64 _IOR(0x12,114,unsigned long long)
-+#endif
- 
- /* including <linux/hdreg.h> also fails */
- struct hd_geometry {
-diff -ruN util-linux-2.12.orig/mount/my_dev_t.h util-linux-2.12/mount/my_dev_t.h
---- util-linux-2.12.orig/mount/my_dev_t.h	2003-07-16 22:05:50.000000000 +0200
-+++ util-linux-2.12/mount/my_dev_t.h	2003-10-16 18:26:53.049372984 +0200
-@@ -4,4 +4,10 @@
- /* for ancient systems use "unsigned short" */
- 
- #include <linux/posix_types.h>
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
- #define my_dev_t __kernel_dev_t
-+#else
-+#define my_dev_t int
-+#endif
diff --git a/sys-apps/util-linux/files/util-linux-2.12-only-root-can-remount.patch b/sys-apps/util-linux/files/util-linux-2.12-only-root-can-remount.patch
deleted file mode 100644
index 2a1d44cd4883..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12-only-root-can-remount.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-linux-2.13-pre2/mount/umount.c
-+++ util-linux-2.13-pre3/mount/umount.c
-@@ -707,7 +707,7 @@
- 
- 	if (getuid () != geteuid ()) {
- 		suid = 1;
--		if (all || types || nomtab || force)
-+		if (all || types || nomtab || force || remount)
- 			die (2, _("umount: only root can do that"));
- 	}
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12-swapon-unistd.patch b/sys-apps/util-linux/files/util-linux-2.12-swapon-unistd.patch
deleted file mode 100644
index 982ab1da8dc6..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12-swapon-unistd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mount/swapon.c.orig	2004-05-07 15:21:06.909712000 +0000
-+++ mount/swapon.c	2004-05-07 15:21:28.319712000 +0000
-@@ -21,6 +21,7 @@
- #include <mntent.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#include <unistd.h>
- #include "swap_constants.h"
- #include "swapargs.h"
- #include "nls.h"
-
diff --git a/sys-apps/util-linux/files/util-linux-2.12i-fat-LABEL-support.patch b/sys-apps/util-linux/files/util-linux-2.12i-fat-LABEL-support.patch
deleted file mode 100644
index 41b713939279..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12i-fat-LABEL-support.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- mount-2.12-fat.patch.orig	2004-11-11 20:16:07.165232227 -0500
-+++ mount-2.12-fat.patch	2004-11-11 20:18:47.717923660 -0500
-@@ -1,11 +1,10 @@
- diff -uNr util-linux-2.12/mount/get_label_uuid.c ../patch/util-linux-2.12/mount/get_label_uuid.c
- --- util-linux-2.12/mount/get_label_uuid.c	2002-11-26 12:18:01.000000000 +0100
- +++ ../patch/util-linux-2.12/mount/get_label_uuid.c	2003-10-20 18:27:56.000000000 +0200
--@@ -43,7 +43,139 @@
-- #endif
-+@@ -43,6 +43,137 @@
-+ 	return rc;
-  }
-  
---/* for now, only ext2, ext3, xfs, ocfs are supported */
- +/* Remove trailing spaces */
- +static void remtrailspc(char *label) {
- +    char *c;
-@@ -137,29 +136,23 @@
- +    return -1;
- +}
- +
--+
--+/* for now, only ext2, ext3, xfs, ocfs, fat, fat32 are supported */
-- int
-- get_label_uuid(const char *device, char **label, char *uuid) {
-- 	int fd;
--@@ -54,8 +186,10 @@
-- 	struct jfs_super_block jfssb;
-- 	struct ocfs_volume_header ovh;	/* Oracle */
-+ /*
-+  * Get both label and uuid.
-+  * For now, only ext2, ext3, xfs, ocfs, ocfs2, reiserfs are supported
-+@@ -54,6 +186,8 @@
-  	struct ocfs_volume_label olbl;
-+ 	struct ocfs2_super_block osb;
-+ 	struct reiserfs_super_block reiserfssb;
- +        struct fat_super_block fatsb;
- +        struct fat32_super_block fat32sb;
-  
---	fd = open(device, O_RDONLY);
--+        fd = open(device, O_RDONLY);
-+ 	fd = open(device, O_RDONLY);
-  	if (fd < 0)
-- 		return rv;
-- 
--@@ -111,7 +245,87 @@
-- 			    memcpy(*label, jfssb.s_label, namesize);
-+@@ -111,6 +245,87 @@
-  		}
-  		rv = 0;
---	}
--+        } else if (lseek(fd, 0, SEEK_SET) == 0
-+ 	}
-++        else if (lseek(fd, 0, SEEK_SET) == 0
- +                   && read(fd, (char*) &fat32sb, sizeof(fat32sb)) == sizeof(fat32sb)
- +                   && fat32sb.s_sig[0] == 0x55
- +                   && fat32sb.s_sig[1] == 0xAA
-@@ -240,9 +233,9 @@
- +                rv = 0;
- +            }
- +        }
-- 
-- 	close(fd);
-- 	return rv;
-+ 	else if (lseek(fd, REISERFS_DISK_OFFSET_IN_BYTES, SEEK_SET)
-+ 		 == REISERFS_DISK_OFFSET_IN_BYTES
-+ 	    && read(fd, (char *) &reiserfssb, sizeof(reiserfssb))
- diff -uNr util-linux-2.12/mount/linux_fs.h ../patch/util-linux-2.12/mount/linux_fs.h
- --- util-linux-2.12/mount/linux_fs.h	2003-07-05 22:16:32.000000000 +0200
- +++ ../patch/util-linux-2.12/mount/linux_fs.h	2003-10-20 18:07:06.000000000 +0200
diff --git a/sys-apps/util-linux/files/util-linux-2.12i-pic.patch b/sys-apps/util-linux/files/util-linux-2.12i-pic.patch
deleted file mode 100644
index 8fb91be8b795..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12i-pic.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ur util-linux-2.12i.orig/fdisk/llseek.c util-linux-2.12i/fdisk/llseek.c
---- util-linux-2.12i.orig/fdisk/llseek.c	2004-11-11 20:08:34.074942938 -0500
-+++ util-linux-2.12i/fdisk/llseek.c	2004-11-11 20:09:43.040353443 -0500
-@@ -3,6 +3,9 @@
-  *
-  * Copyright (C) 1994 Remy Card.  This file may be redistributed
-  * under the terms of the GNU Public License.
-+ *
-+ * Changes:
-+ * 20030712 - Alexander Gabert <pappy@nikita.ath.cx> - adding PIC defines
-  */
- 
- #include <sys/types.h>
-@@ -19,7 +22,9 @@
- 
- #else	/* HAVE_LLSEEK */
- 
--#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
-+/* do not use assembler to put together syscalls at compile time (for llseek for example) when using PIC */
-+#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) \
-+    || defined(__PIC__) || defined(__pic__)
- 
- #define my_llseek lseek
- 
-diff -ur util-linux-2.12i.orig/fdisk/sfdisk.c util-linux-2.12i/fdisk/sfdisk.c
---- util-linux-2.12i.orig/fdisk/sfdisk.c	2004-11-11 20:08:34.074942938 -0500
-+++ util-linux-2.12i/fdisk/sfdisk.c	2004-11-11 20:11:07.242982424 -0500
-@@ -30,6 +30,7 @@
-  * 19990319 - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - i18n
-  * 20040428 - Jeroen Dobbelaere <jeroen.dobbelaere@acunia.com> - added PACKED
-  * 20040824 - David A. Wheeler <dwheeler@dwheeler.com> - warnings to stderr
-+ * 20030712 - Alexander Gabert <pappy@nikita.ath.cx> - adding PIC defines
-  */
- 
- #define PROGNAME "sfdisk"
-@@ -172,7 +173,9 @@
-  * Note: we use 512-byte sectors here, irrespective of the hardware ss.
-  */
- #undef use_lseek
--#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__)
-+/* do not use the assembler constructed syscalls for seeking if compiled as PIC */
-+#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__) \
-+    || defined(__PIC__) && defined(__pic__)
- #define use_lseek
- #endif
- 
-diff -ur util-linux-2.12i.orig/partx/partx.c util-linux-2.12i/partx/partx.c
---- util-linux-2.12i.orig/partx/partx.c	2004-11-11 20:08:34.155928155 -0500
-+++ util-linux-2.12i/partx/partx.c	2004-11-11 20:12:34.740010020 -0500
-@@ -333,7 +333,8 @@
- /*
-  * sseek: seek to specified sector
-  */
--#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__)
-+#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__) \
-+    && !defined(__PIC__) && !defined(__pic__)
- #define NEED__llseek
- #endif
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.12i-swapon-check-symlinks.patch b/sys-apps/util-linux/files/util-linux-2.12i-swapon-check-symlinks.patch
deleted file mode 100644
index b9ed3466e703..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.12i-swapon-check-symlinks.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- util-linux-2.12b/mount/swapon.c.orig	2004-10-28 10:02:44.320023600 -0400
-+++ util-linux-2.12b/mount/swapon.c	2004-10-28 10:02:14.384574000 -0400
-@@ -22,2 +22,3 @@
- #include <stdlib.h>
-+#include <sys/param.h>
- #include <stdio.h>
-@@ -143,10 +144,26 @@
- static int
- is_in_proc_swaps(char *fname) {
- 	int i;
-+	struct stat fstatbuf;
- 
- 	for (i = 0; i < numSwaps; i++)
- 		if (!strcmp(fname, swapFiles[i]))
- 			return 1;
-+
-+	/* fallback:
-+	 * if the device in /etc/fstab is a symlink, the entry
-+	 * in /proc/swaps won't match because the kernel stores
-+	 * absolute pathnames.  Here we compare dev_t's.
-+	 */
-+	if (!lstat(fname, &fstatbuf))
-+		if (S_ISLNK(fstatbuf.st_mode)) {
-+			struct stat swapstatbuf;
-+			for (i = 0; i < numSwaps; i++)
-+				if (!stat(swapFiles[i], &swapstatbuf) && \
-+				    swapstatbuf.st_dev == fstatbuf.st_dev)
-+					return 1;
-+		}
-+
- 	return 0;
- }
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.13-hwclock-rtc.patch b/sys-apps/util-linux/files/util-linux-2.13-hwclock-rtc.patch
deleted file mode 100644
index b62433ca1913..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.13-hwclock-rtc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-http://bugs.gentoo.org/179780
-
-From: Matthias Koenig <mkoenig@suse.de>
-Date: Thu, 20 Sep 2007 09:11:18 +0000 (+0200)
-Subject: hwclock: fix --rtc option
-X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=5d1f6bae3b298809ecd63b3e55f6ab30caaa4dbf
-
-hwclock: fix --rtc option
-
-The --rtc option does not set the name of the device correctly.
-It still uses /dev/rtc even if the --rtc option is given.
-
-Testcase:
-$ mv /dev/rtc /dev/foo
-$ hwclock --show --debug --rtc=/dev/foo
-hwclock from util-linux-2.13-rc2
-Using /dev interface to clock.
-Last drift adjustment done at 1190198135 seconds after 1969
-Last calibration done at 1190198135 seconds after 1969
-Hardware clock is on local time
-Assuming hardware clock is kept in local time.
-Waiting for clock tick...
-hwclock: open() of /dev/rtc failed, errno=2: No such file or directory.
-...got clock tick
-
-Co-Author: Karel Zak <kzak@redhat.com>
-Signed-off-by: Matthias Koenig <mkoenig@suse.de>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
-
-diff --git a/hwclock/rtc.c b/hwclock/rtc.c
-index f8e626e..724daf9 100644
---- a/hwclock/rtc.c
-+++ b/hwclock/rtc.c
-@@ -104,24 +104,21 @@ open_rtc(void) {
- 		"/dev/misc/rtc",
- 		NULL
- 	};
--	char **p = fls;
--	char *fname = rtc_dev_name ? : *p;
--
--	do {
--		int fd = open(fname, O_RDONLY);
--
--		if (fd < 0 && errno == ENOENT) {
--			if (fname == rtc_dev_name)
--				break;
--			fname = *++p;
--		} else {
--			rtc_dev_name = *p;
--			return fd;
--		}
--	} while(fname);
--
--	if (!rtc_dev_name)
--		rtc_dev_name = *fls;
-+	char **p;
-+
-+	/* --rtc option has been given */
-+	if (rtc_dev_name)
-+		return open(rtc_dev_name, O_RDONLY);
-+
-+	for (p=fls; *p; ++p) {
-+		int fd = open(*p, O_RDONLY);
-+
-+		if (fd < 0 && errno == ENOENT)
-+			continue;
-+		rtc_dev_name = *p;
-+		return fd;
-+	}
-+	rtc_dev_name = *fls;	/* default */
- 	return -1;
- }
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.13-losetup-P.patch b/sys-apps/util-linux/files/util-linux-2.13-losetup-P.patch
deleted file mode 100644
index 65ac03084fb6..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.13-losetup-P.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-loop-aes patch forgets to include -P in getopt call
-
-http://bugs.gentoo.org/201981
-
---- mount/lomount.c
-+++ mount/lomount.c
-@@ -1249,7 +1249,7 @@
- 
- 	delete = 0;
- 	progname = argv[0];
--	while ((c = getopt(argc,argv,"aC:de:FG:H:I:K:o:p:rRs:S:Tv")) != -1) {
-+	while ((c = getopt(argc,argv,"aC:de:FG:H:I:K:o:p:rRs:S:TvP:")) != -1) {
- 		switch (c) {
- 		case 'a':		/* show status of all loops */
- 			option_a = 1;
diff --git a/sys-apps/util-linux/files/util-linux-no-kill.patch b/sys-apps/util-linux/files/util-linux-no-kill.patch
deleted file mode 100644
index bd4638bbae6d..000000000000
--- a/sys-apps/util-linux/files/util-linux-no-kill.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN util-linux-2.11z.old/misc-utils/Makefile util-linux-2.11z/misc-utils/Makefile
---- util-linux-2.11z.old/misc-utils/Makefile	2002-11-02 05:51:02.000000000 -0800
-+++ util-linux-2.11z/misc-utils/Makefile	2003-12-06 20:02:28.000000000 -0800
-@@ -34,11 +34,6 @@
- MAN1:=$(MAN1) write.1
- endif
- 
--ifeq "$(HAVE_KILL)" "no"
--BIN:=$(BIN) kill
--MAN1:=$(MAN1) kill.1
--endif
--
- ifeq "$(HAVE_NCURSES)" "yes"
- USRBIN:=$(USRBIN) setterm
- MAN1:=$(MAN1) setterm.1
-@@ -81,7 +76,6 @@
- cal: cal.o $(ERR_O)
- chkdupexe: chkdupexe.pl
- ddate: ddate.o
--kill: kill.o procs.o
- logger: logger.o
- mcookie: mcookie.o $(LIB)/md5.o
- mcookie.o: mcookie.c $(LIB)/md5.h
diff --git a/sys-apps/util-linux/util-linux-2.12r-r7.ebuild b/sys-apps/util-linux/util-linux-2.12r-r7.ebuild
deleted file mode 100644
index d433f7192ee9..000000000000
--- a/sys-apps/util-linux/util-linux-2.12r-r7.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2007 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.12r-r7.ebuild,v 1.13 2007/09/03 15:22:21 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-OLD_CRYPT_VER=2.12i
-LOOP_AES_VER=3.1f
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2
-	old-crypt? (
-		mirror://kernel/linux/utils/${PN}/${PN}-${OLD_CRYPT_VER}.tar.gz
-		mirror://gentoo/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch.bz2
-	)
-	crypt? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v${LOOP_AES_VER}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="crypt old-crypt nls static selinux perl"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	>=sys-fs/e2fsprogs-1.34
-	selinux? ( sys-libs/libselinux )
-	crypt? ( app-crypt/hashalot )
-	perl? ( dev-lang/perl )
-	amd64? ( sys-apps/setarch )
-	mips? ( sys-apps/setarch )
-	ppc? ( sys-apps/setarch )
-	ppc64? ( sys-apps/setarch )
-	sparc? ( sys-apps/setarch )
-	!sys-apps/more"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-OLD_CRYPT_P=${WORKDIR}/${PN}-${OLD_CRYPT_VER}
-
-yesno() { useq $1 && echo yes || echo no; }
-
-src_unpack() {
-	unpack ${A}
-
-	# Old crypt support
-	if use old-crypt ; then
-		cd "${OLD_CRYPT_P}"
-		ewarn "You should update your system as USE=old-crypt"
-		ewarn "support will be dropped in future versions."
-		epatch "${WORKDIR}"/util-linux-${OLD_CRYPT_VER}-cryptoapi-losetup.patch
-	fi
-
-	cd "${S}"
-
-	sed -i '/LDFLAGS.*-s/d' configure #191112
-
-	# crypto support
-	use crypt && epatch "${WORKDIR}"/loop-AES-v${LOOP_AES_VER}/${P}.diff
-
-	# Fall back to cracklib if default words file doesnt exist #114416
-	epatch "${FILESDIR}"/${PN}-2.12r-cracklib-words.patch
-
-	# Fix rare failures with -j4 or higher
-	epatch "${FILESDIR}"/${PN}-2.11z-parallel-make.patch
-
-	# Fix -f usage with -a and in general
-	epatch "${FILESDIR}"/${PN}-2.12q-more-fake-checks-v2.patch
-
-	# Fix mtab updates with `mount --move /foo /bar` #104697
-	epatch "${FILESDIR}"/${PN}-2.12q-update-mtab-when-moving.patch
-
-	# Respect -n with -r and umount #98675
-	epatch "${FILESDIR}"/${PN}-2.12q-umount-dont-write-mtab-with-remount.patch
-
-	# A few fixes to beat update_mtab() into submission.
-	epatch "${FILESDIR}"/${PN}-2.12q-update_mtab-fixes.patch
-
-	# Use update_mtab() to avoid dups in mtab for 'mount -f'
-	epatch "${FILESDIR}"/${PN}-2.12q-use-update_mtab-for-fake.patch
-
-	# Fix unreadable df output when using devfs ... this check is kind of
-	# a hack, but whatever, the output isnt critical at all :P
-	[[ -e /dev/.devfsd ]] && epatch "${FILESDIR}"/no-symlink-resolve.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.
-	epatch "${FILESDIR}"/${PN}-2.11z-agetty-domainname-option.patch
-
-	# Fix french translation typo #75693
-	epatch "${FILESDIR}"/${PN}-2.12q-i18n-update.patch
-
-	# Add NFS4 support (kernel 2.5/2.6)
-	epatch "${FILESDIR}"/${PN}-2.12i-nfsv4.patch
-
-	# ignore managed/kudzu options #70873
-	epatch "${FILESDIR}"/${PN}-2.12i-ignore-managed.patch
-
-	# swapon gets confused by symlinks in /dev #69162
-	epatch "${FILESDIR}"/${PN}-2.12p-swapon-check-symlinks.patch
-
-	# fix simple buffer overflow (from Debian)
-	epatch "${FILESDIR}"/${PN}-2.12q-debian-10cfdisk.patch
-
-	# don't build fdisk on m68k
-	epatch "${FILESDIR}"/${PN}-2.12q-no-m68k-fdisk.patch
-
-	# don't force umask to 022 #93671
-	epatch "${FILESDIR}"/${PN}-2.12q-dont-umask.patch
-
-	# fix cal display when using featureless terminals #112406
-	epatch "${FILESDIR}"/${PN}-2.12r-cal-dumb-terminal.patch
-
-	# Bug #108988 unable to always seek when omiting frame pointers
-	epatch "${FILESDIR}"/${PN}-2.12r-fdisk-frame-pointers.patch
-
-	# don't treat sparc/arm specially
-	epatch "${FILESDIR}"/${PN}-2.12r-umount-no-special.patch
-
-	# Patches from Fedora
-	epatch "${FILESDIR}"/${PN}-2.12r-umount-nosysfs.patch
-
-	# fix mips n32 (no llseek syscall)
-	epatch "${FILESDIR}"/${PN}-2.12-mips-lseek.patch
-
-	epatch "${FILESDIR}"/${PN}-2.12r-no-_syscall.patch #150852
-	epatch "${FILESDIR}"/${PN}-2.12r-HAVE_asm_page_h.patch #168278
-	use crypt && epatch "${FILESDIR}"/${PN}-2.12r-HAVE_asm_page_h-loop-aes.patch
-
-	# Enable random features
-	local mconfigs="MCONFIG"
-	use old-crypt && mconfigs="${mconfigs} ${OLD_CRYPT_P}/MCONFIG"
-	sed -i \
-		-e "/^HAVE_SELINUX=/s:no:$(yesno selinux):" \
-		-e "/^DISABLE_NLS=/s:no:$(yesno !nls):" \
-		-e "/^HAVE_KILL=/s:no:yes:" \
-		-e "/^HAVE_SLN=/s:no:yes:" \
-		-e "/^HAVE_TSORT/s:no:yes:" \
-		-e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
-		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
-		-e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \
-		${mconfigs} || die "MCONFIG sed"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	export CC="$(tc-getCC)"
-
-	econf || die "configure failed"
-	emake || die "emake failed"
-
-	cd partx
-	has_version '>=sys-kernel/linux-headers-2.6' && \
-	has_version '<sys-kernel/linux-headers-2.6.18' \
-		&& append-flags -include linux/compiler.h
-	emake CFLAGS="${CFLAGS}" || die "make partx failed"
-
-	if use old-crypt ; then
-		cd "${OLD_CRYPT_P}"
-		econf || die "old configure failed"
-		emake -C lib || die "old lib failed"
-		emake -C mount losetup mount || die "old make failed"
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	dosym ../man8/agetty.8 /usr/share/man/man1/getty.1
-	dosbin partx/{addpart,delpart,partx} || die "dosbin"
-	use perl || rm -f "${D}"/usr/bin/chkdupexe
-	# required by autotools
-	dosym /bin/arch /usr/bin/arch
-
-	if use crypt || use old-crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop
-	fi
-
-	# man-pages installs renice(1p) but util-linux does renice(8)
-	dosym ../man8/renice.8 /usr/share/man/man1/renice.1
-	# nfs-utils provides nfs(5) now
-	rm "${D}"/usr/share/man/man5/nfs.5 || die
-
-	dodoc HISTORY MAINTAINER README VERSION
-	docinto examples
-	dodoc example.files/*
-
-	if use old-crypt ; then
-		cd "${OLD_CRYPT_P}"/mount
-		into /
-		newbin mount mount-old-crypt || die
-		newbin losetup losetup-old-crypt || die
-		fperms 4711 /bin/{mount,losetup}-old-crypt
-	fi
-}
-
-pkg_postinst() {
-	if ! use old-crypt && use crypt ; then
-		ewarn "This version of util-linux includes crypto support"
-		ewarn "for loop-aes instead of the old cryptoapi."
-		ewarn "If you need the older support, please re-emerge"
-		ewarn "util-linux with USE=old-crypt.  This will create"
-		ewarn "/sbin/mount-old-crypt and /sbin/losetup-old-crypt."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.13-r1.ebuild b/sys-apps/util-linux/util-linux-2.13-r1.ebuild
deleted file mode 100644
index 8ba379345563..000000000000
--- a/sys-apps/util-linux/util-linux-2.13-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 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.13-r1.ebuild,v 1.2 2007/09/04 00:12:44 vapier Exp $
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
-inherit eutils
-[[ ${PV} == "9999" ]] && inherit git
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-ng-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls old-linux selinux"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
-	>=sys-fs/e2fsprogs-1.34
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-		cd "${S}"
-		./autogen.sh || die
-	else
-		unpack ${A}
-		cd "${S}"
-		epatch "${FILESDIR}"/${P}-locale.patch #191111
-		epatch "${FILESDIR}"/${P}-ioprio-syscalls.patch #190613
-	fi
-}
-
-src_compile() {
-	export localedir="/usr/share/locale" #190895
-	econf \
-		--with-fsprobe=blkid \
-		$(use_enable nls) \
-		--enable-agetty \
-		--enable-cramfs \
-		$(use_enable old-linux elvtune) \
-		--disable-init \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rdev \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use_with selinux) \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-}
diff --git a/sys-apps/util-linux/util-linux-2.13.0.1.ebuild b/sys-apps/util-linux/util-linux-2.13.0.1.ebuild
deleted file mode 100644
index 11efce69a684..000000000000
--- a/sys-apps/util-linux/util-linux-2.13.0.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2008 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.13.0.1.ebuild,v 1.2 2008/01/20 11:54:06 vapier Exp $
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
-inherit eutils
-[[ ${PV} == "9999" ]] && inherit git
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-ng-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2b.tar.bz2 )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="crypt loop-aes nls old-linux selinux"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
-	>=sys-fs/e2fsprogs-1.34
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-		cd "${S}"
-		./autogen.sh || die
-	else
-		unpack ${A}
-		cd "${S}"
-		epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
-		epatch "${FILESDIR}"/${PN}-2.13-locale.patch #191111
-		epatch "${FILESDIR}"/${PN}-2.13-ioprio-syscalls.patch #190613
-		epatch "${FILESDIR}"/${PN}-2.13-script-SIGWINCH.patch #191452
-		epatch "${FILESDIR}"/${PN}-2.13-hwclock-rtc.patch #179780
-		use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-2.13.0.1.diff
-		sed -i '/#include <asm\/page.h>/d' mount/swapon.c || die
-	fi
-}
-
-src_compile() {
-	export localedir="/usr/share/locale" #190895
-	econf \
-		--with-fsprobe=blkid \
-		$(use_enable nls) \
-		--enable-agetty \
-		--enable-cramfs \
-		$(use_enable old-linux elvtune) \
-		--disable-init \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rdev \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use_with selinux) \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}
-
-pkg_postinst() {
-	elog "USE=crypt has been changed to USE=loop-aes.  If you need"
-	elog "support for it, make sure to update your USE accordingly."
-}