Old.

12 files changed, 11 insertions, 869 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 92fb03f51e2d..067c61d09fa5 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.364 2012/01/07 20:54:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.365 2012/01/07 20:57:24 vapier Exp $
+
+  07 Jan 2012; Mike Frysinger <vapier@gentoo.org> -util-linux-2.17.2.ebuild,
+  -util-linux-2.18-r1.ebuild, -files/util-linux-2.18-cfdisk-string-len.patch,
+  -files/util-linux-2.18-falloc.patch, -files/util-linux-2.18-ncursesw.patch,
+  -files/util-linux-2.18-slang.patch, -util-linux-2.19.ebuild,
+  -util-linux-2.19.1.ebuild, -files/util-linux-2.19-old-libc.patch,
+  -util-linux-2.20.ebuild:
+  Old.
 
   07 Jan 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.19.1-r1.ebuild:
   Mark ppc64 stable #384305.
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 19f6e016e6e8..bfb4998e99e3 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,42 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
-AUX util-linux-2.18-cfdisk-string-len.patch 1683 RMD160 a96c6e3e58155ec337d9c0b6332f9dc097929cd4 SHA1 a74e8bf9ed61b4f726d986d4468e03b0169b107d SHA256 6f9203bf6ab5c9c3985f18d39f95e01dea00738496ec9d4b9b01a32d49cb7781
-AUX util-linux-2.18-falloc.patch 972 RMD160 19b8168a405c0a0856a1d0d2f5bdf7b8a4254d1d SHA1 9613abeae05082964284ef8ef9c149d2ad49e31e SHA256 632467f3b6d4384e05890468ecf25653a07a6ab35708e5b4bc9a2e46d73469f5
-AUX util-linux-2.18-ncursesw.patch 2163 RMD160 dbf1cd9fbb6c017d0980a7a18064793517f17b69 SHA1 542dcfb520407df8c4b44df967164a7bd632d710 SHA256 e36b3ac4ee5084baa8db5b1d20b4ef07e4061913645718a576b09100d910fed5
-AUX util-linux-2.18-slang.patch 3000 RMD160 dade7c73b8a1b1f3e40a7fd2090be7ccab69bdc6 SHA1 2cde75d7b0d8ce8b671acfb5252423790354a9d3 SHA256 d373ba30d0d60913880fabb4ea2b8adb3a0bca8ca6994c1bb0bb16148dbc41d4
-AUX util-linux-2.19-old-libc.patch 1051 RMD160 708207aefb228964da41ea83c2aadc2b4b887f15 SHA1 39648c38903ebdbb92a76967885ec9e6238d61ec SHA256 25a077162ed3e6e3f26a4cba96180d0bc60fc400e990621885453ba14f0542a8
 AUX util-linux-2.19.1-mount-a-segv.patch 2610 RMD160 67beca8dda0e48a80246c0904329944b978d445a SHA1 8eb682296c0b948a8931d71f0780f446bdd79027 SHA256 c24dc0ed811e6c0ebc69f15c818cf89aeb1dc12b5f2f62163402ad4479d7aec9
 AUX util-linux-2.19.1-umount-l-nfs.patch 2721 RMD160 60e0ccf77633bec6b7a1576810aadd937e464b46 SHA1 ec611d245d42a4ec721fdcc0301f433577d4a45c SHA256 f889de8dba4cb412ec0afcd2605c4f97e0870c6325dd0200e8c8c06794b4bf64
 AUX util-linux-2.20-dmesg-newline.patch 2629 RMD160 b13b0ab0fcfc6399300d60e19740643b453f6b91 SHA1 710d253bdc47253f621dbf305429baae3ef58245 SHA256 818c0a9fba08fe927f3af286bbae1d66dd3b1f32a0fa27722da7def019b3be0a
 AUX util-linux-2.20-sysfs-init.patch 1019 RMD160 049412722104e6a27c49e3098928583cb54ebcb1 SHA1 c76e32a9fc3c18e4fc98406afd937fc711ac8fec SHA256 44b9c38794d73db5c5fd0f0ede8055c77668ddd4df916bc52cc36f8c7c02f108
 DIST util-linux-2.19.1-20110510.diff.bz2 47865 RMD160 0983ac7a48031e4b3e0ddce213887526cfa17bc0 SHA1 e73c7bca691b5d83c1b2725d53a5b669fb268495 SHA256 e04f541ca48951284331e71cbf142d777750dbc9baa051ed9e9913c7dab32b7f
 DIST util-linux-2.19.1.tar.bz2 4396543 RMD160 e4763d21a3a32029ccc525a0222e271f0946a4fd SHA1 96af5d4a37c42296dae5365ba533316216a6b347 SHA256 d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d
-DIST util-linux-2.19.tar.bz2 4376791 RMD160 a1b6bf38106c95f68929de49941c577d77cbd337 SHA1 7e08c8b5d8011b1144ff32019638fa743daf8700 SHA256 d8189ba6dfb508d5c36f50103a7b84943d893e51e6d7a314155a82f68efb33b6
 DIST util-linux-2.20-20110905.diff.bz2 47914 RMD160 6ef3f3ae958d9e3856fae3fae8917f4b0a4d25ff SHA1 76ee9dd2411d1b3e4f7028790ec90fbcd7d1fda1 SHA256 7d8f78cda817c745f88fb951fa0e9ab852f215cdb931e97dedb87a623fc042b6
 DIST util-linux-2.20.1.tar.bz2 4614302 RMD160 4ab3435dbd8b83a0c353301b6e0f89a91aa3ca2c SHA1 b5a9468b933743d2f15d41062c19830a5f804f15 SHA256 d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0
 DIST util-linux-2.20.tar.bz2 4615091 RMD160 c293bee7d9b6b03c0f3981c2020de1471d37b560 SHA1 e8cd2c8e968cdbdc097d82cceaf15d536e0254c1 SHA256 c1cffbf5a1a7a32965f2e8e9ce76336310031e10b87c418d0679075724271d4c
-DIST util-linux-ng-2.17.1-20100308.diff.bz2 57867 RMD160 26584b886ac8db1ec723690a685a442615366f2c SHA1 f76a2deb4b4012e98d82517d84dfb09725533a51 SHA256 c7478553e03ba7cbe28ddb066361966567d97b0746a13396bff12a83183014a0
-DIST util-linux-ng-2.17.2.tar.bz2 3815657 RMD160 398aa54c6001acc16bc2d049ccbdb62824776ba3 SHA1 69275de84f7dabb7a5d90d0046c3a6b861c16a1d SHA256 c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f
-DIST util-linux-ng-2.18-20100706.diff.bz2 58805 RMD160 5b1d645ecf33af652c7be704f213558d5c70202e SHA1 c36d29f27a2ce3f2ec746ae48712ae8ea74af856 SHA256 cde75f181eb998316a7d695da3c93b1894de3cc2b45df2f2c3f21e8b0280b4a4
-DIST util-linux-ng-2.18.tar.bz2 7669676 RMD160 4781871a8f86195b886e81d364d41a57d67869e3 SHA1 154db0512caae0b6e90eee4b7312d4caf3d6b978 SHA256 b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc
-EBUILD util-linux-2.17.2.ebuild 3051 RMD160 026b2b0b3db81975c7594bcfa0bab15786a3944f SHA1 265b4239c661547e28e2cd55633575dd1a91f7c4 SHA256 59a0620df3442c4ecc7d7503c733887d1954f9ff54537dc28da92273bdd321ca
-EBUILD util-linux-2.18-r1.ebuild 3306 RMD160 93f0aa40447ff22ac1f3dcc3e39dc6822c0661a8 SHA1 5bc9048acffaa6b4f48bdf6a705e07399b29fdd6 SHA256 01c2cbfc9eae157e06ad95d3f30c28e32c2e77c888f8ef7ab37f68c9c62f0a63
-EBUILD util-linux-2.19.1-r1.ebuild 3556 RMD160 37b82cf4ad2e319c423ed65ad2fe0bc9cd44c617 SHA1 dd5d376e0e381475bb6bb472479900368dc108a8 SHA256 cdb1c93efe2a7ac5b219652c8fe69fed1304dd09f95709c0a081161223774bb4
-EBUILD util-linux-2.19.1.ebuild 3198 RMD160 0a0c233874bed08f765f2b55cbdeeb2649753d4d SHA1 ba02b37061c8703730463e207e9e27173a5bc76b SHA256 48660b199d7682ba8babeb290d2d7a271efff990277a2e42a5b6c699b9185add
-EBUILD util-linux-2.19.ebuild 3095 RMD160 312e6c056b88910f68f1ea90bd6c850cce9416cf SHA1 ae77aec15141801b9841f187ea0c7d8470adbb4c SHA256 225d3462c4ebd34425317f855346b20288a5895dde86e6cce37b9327ae4637d1
+EBUILD util-linux-2.19.1-r1.ebuild 3558 RMD160 b6024990e9501090a22fa40548aa70e54a061bfa SHA1 966efb8292b03a9a4280941587f7d2b8a90c9b5e SHA256 c1993f3f5e30ea1d30c9331f21e040dac54fd470789a7b059b91488ab54e7f8d
 EBUILD util-linux-2.20-r1.ebuild 3639 RMD160 8dad7cbdd3c818084c42cbbe49a37fbf179a6d41 SHA1 a5046f99c84b287513ff0a21ede079f809b444a5 SHA256 bcc4068e636e22caf5ed3b2736a4925b91f692afdb93bf5f241833b97f6adfe1
 EBUILD util-linux-2.20.1.ebuild 3547 RMD160 4a1bbfca3a9ef92434a97c67f60a713169b65f8b SHA1 f4dda0c5897a41db10cd99cf05d21c398ec04d94 SHA256 e243573ddec8195c5ce78caba20995751e51fa50cf73166064937bb5456d1e63
-EBUILD util-linux-2.20.ebuild 3396 RMD160 b5b3a3a47f876bdbc3e5671bf61f427090d90ce7 SHA1 fe9a3f34acc5ffef2610feb550437f82fd5f27d8 SHA256 c18d1c9eba9a0425b848566c97a7d24446d0b06137b9445ceaf86fd22cdd926e
 EBUILD util-linux-9999.ebuild 3484 RMD160 381e86fb57869c39428093e97b366aaa3788f0aa SHA1 b40983fbf808fbe10d7947d1560dde8b0b4d8819 SHA256 198e0182c336b73b032b2a4b315308fa84ff7a0edf69bd61e0d632dceaaf6cbd
-MISC ChangeLog 55550 RMD160 72b1a39845e91470c405ca13d9d008035b8fed88 SHA1 213f36efea385eafd03277c75398fbc4dc3abc6e SHA256 10fc11deb9c2b7a0b33d2351133732505cd15937a98cc4cac1233e910771d7ef
+MISC ChangeLog 55662 RMD160 289b450b24b8e7461c750c0dfc17fa7ef46ea8df SHA1 69d57d1f73a18f3aad2984d003dff85375678fce SHA256 fe00d6f1000cd6f6cca49f06b83e57242ce71c0a769bfc02769f66a4088ec30c
 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk7+E+EACgkQOeoy/oIi7uxv5QCeLIJDvJs1X+BZSgrii1bzCuQf
-fjsAnRqZvdUTEGo3T1sQccOdGHKQ3ua4
-=E4bQ
------END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.18-cfdisk-string-len.patch b/sys-apps/util-linux/files/util-linux-2.18-cfdisk-string-len.patch
deleted file mode 100644
index 5b2d5f198ed7..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.18-cfdisk-string-len.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://bugs.gentoo.org/328959
-
-From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 19 Jul 2010 22:52:58 +0200
-Subject: [PATCH] cfdisk: get_string not calculating correct limits
-
-Reported-by: James L. Hammons <jlhamm@acm.org>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- fdisk/cfdisk.c |   11 ++++++++---
- 1 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
-index 7fa0b19..e7955fe 100644
---- a/fdisk/cfdisk.c
-+++ b/fdisk/cfdisk.c
-@@ -421,6 +421,11 @@ fdexit(int ret) {
-     exit(ret);
- }
- 
-+/*
-+ * Note that @len is size of @str buffer.
-+ *
-+ * Returns number of read bytes (without \0).
-+ */
- static int
- get_string(char *str, int len, char *def) {
-     size_t cells = 0, i = 0;
-@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) {
- 	    break;
- 	default:
- #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
--	    if (i < len && iswprint(c)) {
-+	    if (i + 1 < len && iswprint(c)) {
- 		wchar_t wc = (wchar_t) c;
- 		char s[MB_CUR_MAX + 1];
- 		int  sz = wctomb(s, wc);
-@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) {
- 			putchar(BELL);
- 	    }
- #else
--	    if (i < len && isprint(c)) {
-+	    if (i + 1 < len && isprint(c)) {
- 	        mvaddch(y, x + cells, c);
- 		if (use_def) {
- 		    clrtoeol();
-@@ -2405,7 +2410,7 @@ change_id(int i) {
- 
-     sprintf(def, "%02X", new_id);
-     mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: "));
--    if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT)
-+    if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT)
- 	return;
- 
-     if (len != GS_DEFAULT) {
--- 
-1.7.1.1
-
diff --git a/sys-apps/util-linux/files/util-linux-2.18-falloc.patch b/sys-apps/util-linux/files/util-linux-2.18-falloc.patch
deleted file mode 100644
index fd302905d38c..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.18-falloc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a58285bfb1e37b87c7a85afaead9c9496bc1badb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 3 Oct 2010 15:58:12 -0400
-Subject: [PATCH] fallocate: fix build failure with old linux headers
-
-If linux/falloc.h does not exist, the build system still enables the
-fallocate util, but ultimately fails when it tries to include the
-header and use a define from it.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- sys-utils/fallocate.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
-index d1f43c2..fd4d2a9 100644
---- a/sys-utils/fallocate.c
-+++ b/sys-utils/fallocate.c
-@@ -37,7 +37,11 @@
- # include <sys/syscall.h>
- #endif
- 
--#include <linux/falloc.h>	/* for FALLOC_FL_* flags */
-+#ifdef HAVE_LINUX_FALLOC_H
-+# include <linux/falloc.h>	/* for FALLOC_FL_* flags */
-+#else
-+# define FALLOC_FL_KEEP_SIZE 1
-+#endif
- 
- #include "nls.h"
- #include "strtosize.h"
--- 
-1.7.3
-
diff --git a/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch b/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch
deleted file mode 100644
index 8627b2f1dd2b..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.18-ncursesw.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 01f6b78145dbb46ed9205613daf7d06956a5795f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 1 Jul 2010 13:40:33 -0400
-Subject: [PATCH] cfdisk: search for ncursesw/ncurses.h
-
-Some distros install the wide version of ncurses side by side with the
-non-wide version and place the wide headers in an ncursesw/ subdir.  So
-detect that behavior and include the right header with cfdisk.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac   |    1 +
- fdisk/cfdisk.c |    2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-# ATM we avoid regenerating autotools
-#diff --git a/configure.ac b/configure.ac
-#index 8c5f92f..e4f8884 100644
-#--- a/configure.ac
-#+++ b/configure.ac
-#@@ -442,6 +442,7 @@ if test "x$with_ncurses" != xno; then
-     if test "x$with_ncurses" = xauto; then
-       UTIL_CHECK_LIB(ncursesw, initscr, ncurses)
-       if test "x$have_ncurses" = xyes; then
-+        AC_CHECK_HEADERS([ncursesw/ncurses.h])
-         NCURSES_LIBS="-lncursesw"
-       fi
-     fi
---- a/config.h.in
-+++ b/config.h.in
-@@ -229,6 +229,9 @@
- /* Define to 1 if you have the <ncurses/ncurses.h> header file. */
- #undef HAVE_NCURSES_NCURSES_H
- 
-+/* Define to 1 if you have the <ncursesw/ncurses.h> header file. */
-+#undef HAVE_NCURSESW_NCURSES_H
-+
- /* Define to 1 if you have the <netinet/in.h> header file. */
- #undef HAVE_NETINET_IN_H
- 
---- a/configure
-+++ b/configure
-@@ -17784,7 +17784,7 @@ if test "x$with_ncurses" != xno; then
-   have_ncurses=no
- 
- 
--for ac_header in ncurses.h ncurses/ncurses.h
-+for ac_header in ncurses.h ncurses/ncurses.h ncursesw/ncurses.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
-index 552858b..7fa0b19 100644
---- a/fdisk/cfdisk.c
-+++ b/fdisk/cfdisk.c
-@@ -75,6 +75,8 @@
- #include <slcurses.h>
- #elif defined(HAVE_SLANG_SLCURSES_H)
- #include <slang/slcurses.h>
-+#elif defined(HAVE_NCURSESW_NCURSES_H) && defined(HAVE_WIDECHAR)
-+#include <ncursesw/ncurses.h>
- #elif defined(HAVE_NCURSES_H)
- #include <ncurses.h>
- #elif defined(HAVE_NCURSES_NCURSES_H)
--- 
-1.7.1
diff --git a/sys-apps/util-linux/files/util-linux-2.18-slang.patch b/sys-apps/util-linux/files/util-linux-2.18-slang.patch
deleted file mode 100644
index 65c70d8407e6..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.18-slang.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-http://bugs.gentoo.org/326373
-
-From 541e6934e1fe6833b125c1c64f9a1108bc3d09fa Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 1 Jul 2010 10:56:41 +0200
-Subject: [PATCH] cfdisk: fix --with-slang
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- fdisk/Makefile.in |    2 +-
- fdisk/cfdisk.c    |   11 ++++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
---- a/fdisk/Makefile.in
-+++ b/fdisk/Makefile.in
-@@ -88,8 +88,7 @@
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@am_cfdisk_OBJECTS = cfdisk-cfdisk.$(OBJEXT) \
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@	$(am__objects_2)
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@am_cfdisk_OBJECTS = cfdisk-cfdisk.$(OBJEXT) \
--@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@	$(am__objects_2) \
--@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@	cfdisk-mbsalign.$(OBJEXT)
-+@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@	$(am__objects_2)
- cfdisk_OBJECTS = $(am_cfdisk_OBJECTS)
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_DEPENDENCIES = $(ldadd_blkid)
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_DEPENDENCIES = $(ldadd_blkid)
-@@ -443,7 +444,7 @@
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_STATIC_SFDISK_TRUE@sfdisk_static_SOURCES = $(sfdisk_SOURCES)
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_STATIC_SFDISK_TRUE@sfdisk_static_LDFLAGS = -all-static
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_SOURCES = cfdisk.c $(fdisk_common)
--@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c
-+@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c $(fdisk_common)
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_CFLAGS = $(cflags_blkid)
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_CFLAGS = $(cflags_blkid)
- @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_LDADD = @NCURSES_LIBS@ $(ldadd_blkid)
-diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
-index 30550c0..552858b 100644
---- a/fdisk/cfdisk.c
-+++ b/fdisk/cfdisk.c
-@@ -64,6 +64,13 @@
- #include <errno.h>
- #include <getopt.h>
- #include <fcntl.h>
-+
-+#ifdef HAVE_SLANG_H
-+#include <slang.h>
-+#elif defined(HAVE_SLANG_SLANG_H)
-+#include <slang/slang.h>
-+#endif
-+
- #ifdef HAVE_SLCURSES_H
- #include <slcurses.h>
- #elif defined(HAVE_SLANG_SLCURSES_H)
-@@ -73,6 +80,7 @@
- #elif defined(HAVE_NCURSES_NCURSES_H)
- #include <ncurses/ncurses.h>
- #endif
-+
- #include <signal.h>
- #include <math.h>
- #include <string.h>
-@@ -431,7 +439,8 @@ get_string(char *str, int len, char *def) {
- 
-     refresh();
- 
--#if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
-+#if !defined(HAVE_SLCURSES_H) && !defined(HAVE_SLANG_SLCURSES_H) && \
-+    defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
-     while ((key = get_wch(&c)) != ERR &&
- 	   c != '\r' && c != '\n' && c != KEY_ENTER) {
- #else
--- 
-1.7.1
-
diff --git a/sys-apps/util-linux/files/util-linux-2.19-old-libc.patch b/sys-apps/util-linux/files/util-linux-2.19-old-libc.patch
deleted file mode 100644
index 2ffff84fc61f..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.19-old-libc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-http://bugs.gentoo.org/361271
-
-random upstream patches for building with older versions of glibc
-
---- a/shlibs/mount/src/context_umount.c
-+++ b/shlibs/mount/src/context_umount.c
-@@ -21,6 +21,34 @@
- #include "strutils.h"
- #include "mountP.h"
- 
-+#if defined(MNT_FORCE)
-+/* Interesting ... it seems libc knows about MNT_FORCE and presumably
-+   about umount2 as well -- need not do anything */
-+#else /* MNT_FORCE */
-+/* Does the present kernel source know about umount2? */
-+# include <linux/unistd.h>
-+# ifdef __NR_umount2
-+static int umount2(const char *path, int flags);
-+_syscall2(int, umount2, const char *, path, int, flags);
-+# else /* __NR_umount2 */
-+static int
-+umount2(const char *path, int flags) {
-+	fprintf(stderr, _("umount: compiled without support for -f\n"));
-+	errno = ENOSYS;
-+	return -1;
-+}
-+#endif /* __NR_umount2 */
-+# if !defined(MNT_FORCE)
-+# define MNT_FORCE 1
-+#endif
-+
-+#endif /* MNT_FORCE */
-+
-+#if !defined(MNT_DETACH)
-+#define MNT_DETACH 2
-+#endif
-+
-+
- static int lookup_umount_fs(struct libmnt_context *cxt)
- {
- 	int rc;
diff --git a/sys-apps/util-linux/util-linux-2.17.2.ebuild b/sys-apps/util-linux/util-linux-2.17.2.ebuild
deleted file mode 100644
index eb599b1314b8..000000000000
--- a/sys-apps/util-linux/util-linux-2.17.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2011 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.17.2.ebuild,v 1.12 2011/12/30 19:30:43 ulm Exp $
-
-EAPI="2"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git autotools
-
-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/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17.1-20100308.diff.bz2 )"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="crypt loop-aes nls old-linux perl selinux slang uclibc unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	perl? ( dev-lang/perl )
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autopoint --force
-		eautoreconf
-	else
-		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
-	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.c
-	#define _GNU_SOURCE
-	#include <fcntl.h>
-	main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.c
-}
-
-src_configure() {
-	lfs_fallocate_test
-	econf \
-		$(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 unicode || echo --with-ncurses) \
-		$(use_with selinux) \
-		$(use_with slang) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-
-	if ! use perl ; then #284093
-		rm "${D}"/usr/bin/chkdupexe || die
-		rm "${D}"/usr/share/man/man1/chkdupexe.1 || die
-	fi
-
-	# need the libs in /
-	gen_usr_ldscript -a blkid uuid
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	rm -f "${D}"/usr/$(get_libdir)/*.la
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.18-r1.ebuild b/sys-apps/util-linux/util-linux-2.18-r1.ebuild
deleted file mode 100644
index 77a96e764eb7..000000000000
--- a/sys-apps/util-linux/util-linux-2.18-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 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.18-r1.ebuild,v 1.13 2011/12/30 19:30:43 ulm Exp $
-
-EAPI="2"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git autotools
-
-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/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.18-20100706.diff.bz2 )"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="+cramfs crypt loop-aes nls old-linux perl selinux slang uclibc unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	cramfs? ( sys-libs/zlib )
-	perl? ( dev-lang/perl )
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autopoint --force
-		eautoreconf
-	else
-		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
-	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-	epatch "${FILESDIR}"/${P}-ncursesw.patch
-	epatch "${FILESDIR}"/${P}-slang.patch #326373
-	epatch "${FILESDIR}"/${P}-cfdisk-string-len.patch #328959
-	epatch "${FILESDIR}"/${P}-falloc.patch #339432
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.c
-	#define _GNU_SOURCE
-	#include <fcntl.h>
-	main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.c
-}
-
-src_configure() {
-	lfs_fallocate_test
-	econf \
-		--enable-fs-paths-extra=/usr/sbin \
-		$(use_enable nls) \
-		--enable-agetty \
-		$(use_enable cramfs) \
-		$(use_enable old-linux elvtune) \
-		--disable-init \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use unicode || echo --with-ncurses) \
-		$(use_with selinux) \
-		$(use_with slang) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-
-	if ! use perl ; then #284093
-		rm "${D}"/usr/bin/chkdupexe || die
-		rm "${D}"/usr/share/man/man1/chkdupexe.1 || die
-	fi
-
-	# need the libs in /
-	gen_usr_ldscript -a blkid uuid
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	rm -f "${D}"/usr/$(get_libdir)/*.la
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.19.1.ebuild b/sys-apps/util-linux/util-linux-2.19.1.ebuild
deleted file mode 100644
index 8f11f1ba02c9..000000000000
--- a/sys-apps/util-linux/util-linux-2.19.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 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.19.1.ebuild,v 1.9 2011/12/30 19:30:43 ulm Exp $
-
-EAPI="2"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git autotools
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.19.1-20110510.diff.bz2 )"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="+cramfs crypt loop-aes ncurses nls old-linux perl selinux slang uclibc unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	perl? ( dev-lang/perl )
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autopoint --force
-		eautoreconf
-	else
-		use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
-	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.c
-	#define _GNU_SOURCE
-	#include <fcntl.h>
-	main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.c
-}
-
-usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
-src_configure() {
-	lfs_fallocate_test
-	econf \
-		--enable-fs-paths-extra=/usr/sbin \
-		$(use_enable nls) \
-		--enable-agetty \
-		$(use_enable cramfs) \
-		$(use_enable old-linux elvtune) \
-		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
-		--disable-init \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use_with selinux) \
-		$(use_with slang) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-
-	if ! use perl ; then #284093
-		rm "${D}"/usr/bin/chkdupexe || die
-		rm "${D}"/usr/share/man/man1/chkdupexe.1 || die
-	fi
-
-	# need the libs in /
-	gen_usr_ldscript -a blkid uuid
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	rm -f "${D}"/usr/$(get_libdir)/*.la
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.19.ebuild b/sys-apps/util-linux/util-linux-2.19.ebuild
deleted file mode 100644
index 3ecac574e470..000000000000
--- a/sys-apps/util-linux/util-linux-2.19.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2011 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.19.ebuild,v 1.5 2011/12/30 19:30:43 ulm Exp $
-
-EAPI="2"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git autotools
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="+cramfs crypt ncurses nls old-linux perl selinux slang uclibc unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	perl? ( dev-lang/perl )
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autopoint --force
-		eautoreconf
-	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-	epatch "${FILESDIR}"/${P}-old-libc.patch #361271
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.c
-	#define _GNU_SOURCE
-	#include <fcntl.h>
-	main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.c
-}
-
-usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
-src_configure() {
-	lfs_fallocate_test
-	econf \
-		--enable-fs-paths-extra=/usr/sbin \
-		$(use_enable nls) \
-		--enable-agetty \
-		$(use_enable cramfs) \
-		$(use_enable old-linux elvtune) \
-		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
-		--disable-init \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use_with selinux) \
-		$(use_with slang) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-
-	if ! use perl ; then #284093
-		rm "${D}"/usr/bin/chkdupexe || die
-		rm "${D}"/usr/share/man/man1/chkdupexe.1 || die
-	fi
-
-	# need the libs in /
-	gen_usr_ldscript -a blkid uuid
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	rm -f "${D}"/usr/$(get_libdir)/*.la
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.20.ebuild b/sys-apps/util-linux/util-linux-2.20.ebuild
deleted file mode 100644
index afc0c2617aac..000000000000
--- a/sys-apps/util-linux/util-linux-2.20.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2011 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.20.ebuild,v 1.5 2011/12/30 19:30:43 ulm Exp $
-
-EAPI="3"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-inherit eutils toolchain-funcs libtool flag-o-matic
-[[ ${PV} == "9999" ]] && inherit git autotools
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
-fi
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang static-libs uclibc unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r3
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	perl? ( dev-lang/perl )
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		po/update-potfiles
-		autopoint --force
-		eautoreconf
-	else
-		use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
-	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.c
-	#define _GNU_SOURCE
-	#include <fcntl.h>
-	main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.c
-}
-
-usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
-src_configure() {
-	lfs_fallocate_test
-	econf \
-		--enable-fs-paths-extra=/usr/sbin \
-		$(use_enable nls) \
-		--enable-agetty \
-		$(use_enable cramfs) \
-		$(use_enable ddate) \
-		$(use_enable old-linux elvtune) \
-		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use_with selinux) \
-		$(use_with slang) \
-		$(use_enable static-libs static) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-	use ddate || find "${ED}"/usr/share/man -name 'ddate.1*' -delete
-
-	if ! use perl ; then #284093
-		rm "${ED}"/usr/bin/chkdupexe || die
-		rm "${ED}"/usr/share/man/man1/chkdupexe.1 || die
-	fi
-
-	# need the libs in /
-	gen_usr_ldscript -a blkid uuid
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	rm -f "${ED}"/usr/$(get_libdir)/*.la
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}