Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

8 files changed, 25 insertions, 393 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 6415a1192fa0..3338d956f478 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.114 2014/01/16 13:55:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.115 2014/06/26 14:00:22 kensington Exp $
+
+  26 Jun 2014; Michael Palimaka <kensington@gentoo.org>
+  -files/util-vserver-0.30.215-2718.patch,
+  -files/util-vserver-0.30.215-capget.patch,
+  -files/util-vserver-0.30.215-dietmmap.patch,
+  -files/util-vserver-0.30.215-openrc.patch,
+  -files/util-vserver-0.30.215-typo.patch,
+  -util-vserver-0.30.216_pre2910.ebuild:
+  Remove old.
 
   16 Jan 2014; Jeroen Roovers <jer@gentoo.org>
   util-vserver-0.30.216_pre2910.ebuild, util-vserver-0.30.216_pre3025.ebuild,
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index b95b1c49d25e..92e0e41279f0 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -2,24 +2,28 @@
 Hash: SHA256
 
 AUX bash_completion 7568 SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d SHA512 b9e5745775121107da14540103bbf4943692a514cf3cd69b71c999a5e0eb1c81253b6ac4ca635cdb6e64cd1f1c1204dfecd4a6f83cbe7d5448625c53f80ed3bb WHIRLPOOL a17cc603408cf178c0d8299e6f36133715f6ec6c5a21c7440dca49338dde2280d24bb26852a21326ab2b62ac787ed84d06d0baf3097c0188f2448fbf055e79ab
-AUX util-vserver-0.30.215-2718.patch 3088 SHA256 1411d738d1d82a6972af266eefa89c3924db95f58f7e620eaf4123dc9310573f SHA512 5bc42a3f30463cdf8acf08edf0d0b7e073f396765877fa2b2c7eb1463d72e566240e895337a455499a1bc286b295487b1b159a38c085f68e221e8d04bb9bec03 WHIRLPOOL f1e5c0a54d36c58f38d6c6f922dabf5af195ac60573e855574c2a9159f73270d56d6126d3592ebf6faef5c6ec8b237a09f43b5b26310cc418a0c6af99624358c
-AUX util-vserver-0.30.215-capget.patch 2813 SHA256 0ef843ccaac93acbac69e082e26b7b901d1a72c78f3552cd7c55e758997f1a3c SHA512 b4cd3753132d8b82591222d0d8167049cfa2e65e658f8122ea4f9ecd021a854226693e90c6635b5c412439fdcccfc047b2b169e750c955794ddd8e7d7a22f300 WHIRLPOOL db904cb0b905ed7752ac5e1ce81d36e35ee72de682494bdf18b09e2117859223b3d2bf172e2cf4543f8e569ac662203857fb31d20807b626d78df92e4caf767e
-AUX util-vserver-0.30.215-dietmmap.patch 2175 SHA256 c54d9c44199c705c52efef4bc50c436dafa0738c50a96c5728bf002885f32403 SHA512 f13ac28b7b6a482da8c29e100c859233376ba3ca7ea89345adcd05db8065014c40081659f1abe0966cc398c6cfa326b39f2ebdae7b92adb2d0293b23710ae208 WHIRLPOOL 66e8ec779de58e6ee5a0658c36643a96c2b53292aeea7476a517e818a733bf73d3fcad9a52f24f58efa5f18ebf81b13e51a7efaa724fd86af15e46500efa3658
-AUX util-vserver-0.30.215-openrc.patch 1138 SHA256 f6a4d24c708ee882e506f63ad16cf259c06ef7840d860f77da74d8e970e9297c SHA512 4c2dcca94bd0ca6331a4b77511505710bf5749b6c10a669906a3cd8953ba711d1c1d6ca5a776e81cf02347ee92ef2c6e9f11e2cf874e9b5db574d2487cf0da32 WHIRLPOOL 06f05e9506e361882edb7fc5796885659ceee3d7420da1750a669d78dd191643e06e630a12840d349975c5a87ecae08d55d04d85d5d058aee75e09922dd50a2a
-AUX util-vserver-0.30.215-typo.patch 564 SHA256 f0e809a33f32cf49e34f9c8c65803ba6bf96ecd2a233eb48338dbab3923a3c6b SHA512 4292bd7923b932e3928baa15150e04af7f6a31fb439f4173d30546ef23b5e97436e829c47ec369a151e6bbc12e1c6f7c35d8bb420aaf864aa66363b06a2cd57b WHIRLPOOL 90199ced5a62aad59dab6ffec502e7d3eb7b2395fe35ac5ed778a129a1adf6365cd1309ea20b0cfb7c019ad22730a6c704f0a1f56660c53d19bd9e1315b32908
 AUX util-vserver-0.30.216-varlock.patch 646 SHA256 ce2838016fd3ee9cbcdc0b2d52aa6988a437b7bd06ca1debc7ad4049130c0d46 SHA512 85fe6013d92a5c0ed3772511988f16319e1fa829d230bc40de1f9fb28a85fd49c69536185019066c959cf05c9a4b82ad4a51840bb0a5624775c518e8e29c53b9 WHIRLPOOL 150c656644946c835f0f2aca245453106520bbec4a10a656efb3ddce6f2ba925ecde5ae1606f8ba58b0046374991feed068bd4da2046e1ec2a5155ea7cafbfe7
-DIST util-vserver-0.30.216-pre2910.tar.bz2 714605 SHA256 a07b90442bb1de4cedac668fd505199eeb70aff53482e0bbd2535875cde46d06
 DIST util-vserver-0.30.216-pre3025.tar.bz2 760763 SHA256 6b6df2e96105361e7ede644d522e1cee60fd71ef72715b82e40a4a93ce7ea949 SHA512 5d799a19c8c78b7c2222e0d17490010d065e02e2a49020fb4766a98fb85a59d889881d231a279012935ff3d108706edf71c1e8736390cb9a7ce9af969a716a56 WHIRLPOOL 06e30603ead7d6835b3f70fb2491698619d82b898980529e9190818df76a4a2575f28fc82bc18cda67def2ae43c0e8c4b8038b10f37caf29f41fd029cce8124c
 DIST util-vserver-0.30.216-pre3038.tar.bz2 762540 SHA256 06f7b2390578767e5c27237538eda3803134041c307da2c8409d5a6d49800525 SHA512 cf00f8482831e6b682faee309b72a899b16177b4783253596a83986828e38a5fb4b88e152e060ecec21e208c42058d56e88eaba3e7cdf5ceb40dc5f5c8f7711d WHIRLPOOL 0931fb17316982ba8ccfb9409112d72f2928327aed5677ea9756cb8eba3639b4090173b73d313945f8bf44b6b65db94a8bfb3619ba8ed865402c1f8e217c285f
-EBUILD util-vserver-0.30.216_pre2910.ebuild 3561 SHA256 c9481bf8f9e426c0011a0b53515b456d12bede35a00a284b6a9e1dfc91921506 SHA512 9e3a7a4f0ab2cf3f27f9a80829c57b2c69195f16a0830641b68c12559227c36824069bbc094e0a517d0fc9dd98353bd4e043217727c15ac31e1c59f336277cbb WHIRLPOOL 4ba063acf96b8282bdbff0e25fcd0492eef8ad9114a03072e9f164b2adeabf2d16a9583dc1ef3f381fe422b616fcb953f3b79797de1479e04aac9b56b62058ae
 EBUILD util-vserver-0.30.216_pre3025.ebuild 2393 SHA256 ff5dc3a1eb3aa149f3c39ccb34fecfc90af46e731bc25cdf5cab18aea154eb97 SHA512 e27e2792d980c2b67a1203680e5006b53da5628bf0a0792ac8d16c5e3cd26e1766a582e4b43de369cd088cd657f0eaff45f47e208de5ed4e6b690d2b566f6758 WHIRLPOOL 52d0a04569afed90ad2f31e7f0c88724d090c04428e63ea2df22fbfe4eabd06fac4fec17041c4147afee9c5ac35af65f7a07cfd7d07c4f02dd33778986c62109
 EBUILD util-vserver-0.30.216_pre3038.ebuild 2359 SHA256 94d2607b0c5a5e6ac43b8d3b47588d5ca8cdd62cc41370533878ed118c37615a SHA512 1d18d57e60a9ca0887be95911a42f5c34438cd932aa16bddf477509a3b21b9d9eb03bc5b5476738a461a4afd9712cb574e1b14f3c87f492d2c5e3330c45bf4be WHIRLPOOL 4fad1256683b8afd469d818c995985afb7e57d28fc2b64ae9d2aa6e00088056c9010b536f1ad5a4b52de1cc420899525230da5f64c1eaef817472b7dfe91f424
-MISC ChangeLog 23640 SHA256 ec8d09838d561e44b1c53488623192f91f3265b04dc84589ad18b193c8514654 SHA512 857fea74f28f57563a8f9c116b7c5a0108465fd4e5f39b52c5d2bafdd273ef569d5ce751de5680645492a47f68e11059c38929f58367e0bc0445c68f54605bf8 WHIRLPOOL b70906bffd0c1ff591f5c0636a9f253a374f550946e4f4fcc4a060ff133fab8c27090b3654c2d786f3c60c8d46b5ba24c2a650ede3ecb52eabd6a7427f0eacd3
+MISC ChangeLog 23982 SHA256 6ab4563a84bd69861b9ef0fb90244d26cb71ef8351a24633f920e1f3e32b01bb SHA512 a8820c714886885410159c3fa82720302949447d38f04f882e19b38d023b55d51088823583aba7c7762e89b559bd4c33c0a590358b19c10879bf5dfb12e77095 WHIRLPOOL e242ca1533c1c121d8ba24ecdfca9a1600953d12d4e2cd8df0a8bb6b42b86e73e290108169c9aed2f280c36d2bdee3abe5355cf6a3893fb51b185d72033d9197
 MISC metadata.xml 565 SHA256 4473dca9c2e5309c7836282184adb19ae99c09db527aaa51dbc2682673900488 SHA512 d93d6c9b118bf18deef710e02ece1e3e94b3e7a6f5dd44906386e0691ad4dd51c8c2a88bb08d41c876e1ba3e3c63328c02b0563262bf60f092eb88179494eab8 WHIRLPOOL 9c751f0c039bb64a9aa72aa363e095131a00b1ca50883986c775fb81532f355a49519e5363f8728c0c92c8cf78e068dd8a23c9daa8ed03b764648de330750939
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLX5LoACgkQVWmRsqeSphNVwwCffHpJnCOCXK6mRtAu9DcK1gz8
-/g4AmgIGIlVRF0dQc+eMIUHlLQ5djp67
-=/E7o
+iQJiBAEBCABMBQJTrCd3RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7LnJD/9cgHaCA2k6zv25KHG76nXBRrPz0pIwqSD/I4siN45TZZkobaGZJoj2RK0u
+zJy6JQFFpm2S/v5xxej9aW4k+KoEscNiFTLPb/v/2J0WAoximyGSIl9US+Hv9MI7
+AD5BOHV2ynMBFrCI7gZkxEbPY2GxwYyXYixCXayPBudHv8/Y02mQA68jmL6SLAY+
+aOu8IHgerfn1vJIyv/BP4QIT2bdF9F3heyItvIcHbI6SZof9FeTfZ0YbngIcFXe/
+YRY9Z6buNBrmkTJgw4ErVK3yyOGKmth3VldWD5EqWs6H43RJrXyxZ66Q7f6ROe5C
+IvrAebh4cPC7VaU5HyICJBPT1Zlc94G5tvZJDUeFbRXx9Go9zUhVPmRHczpPhy3h
+XNOlI6wrYFhJVgl7FG7Uig5ubxHMY/fpVRukKRG+cwWPOV/CCJM5HRWp5cbTq+al
+4oj+5pPeOvv2KDww4rhSGTazuIpASMMmjBBwGTt3J8FJBUBAQrvuLMqEneAZ0V3K
+Q8Xq1vhOiemtUgfWL8tlTiJNHSWf+1ur8oMjO+8WxY++6otVyV+Wx6K3IlS0vLTX
+P25P5rYC8Be1WG9B9iHflx9j/YXuj0rIulVPiq6+0Ll5EE2RJlBHNz8+6niN/XNn
+PJuyGW0bFssuiqdW4fxq7DPVBdFZB3uc74gYgrrubAXItZFTeg==
+=llao
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch
deleted file mode 100644
index fc9ea6164fba..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nru util-vserver-0.30.215.orig/lib_internal/unify-copy.c util-vserver-0.30.215/lib_internal/unify-copy.c
---- util-vserver-0.30.215.orig/lib_internal/unify-copy.c	2008-03-17 09:59:50.000000000 +0100
-+++ util-vserver-0.30.215/lib_internal/unify-copy.c	2008-06-17 15:38:50.000000000 +0200
-@@ -132,8 +132,8 @@
-       buf_size = in_len - offset;
-       if (buf_size > MMAP_BLOCKSIZE) buf_size = MMAP_BLOCKSIZE;
-       
--      if ((in_buf  = mmap(0, buf_size, PROT_READ,  MAP_SHARED,  in_fd, offset))==0 ||
--	  (out_buf = mmap(0, buf_size, PROT_WRITE, MAP_SHARED, out_fd, offset))==0) {
-+      if ((in_buf  = mmap(0, buf_size, PROT_READ,  MAP_SHARED,  in_fd, offset))==MAP_FAILED ||
-+	  (out_buf = mmap(0, buf_size, PROT_WRITE, MAP_SHARED, out_fd, offset))==MAP_FAILED) {
- 	perror("mmap()");
- 	goto out;
-       }
-diff -Nru util-vserver-0.30.215.orig/src/check-unixfile.c util-vserver-0.30.215/src/check-unixfile.c
---- util-vserver-0.30.215.orig/src/check-unixfile.c	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/check-unixfile.c	2008-06-17 15:39:11.000000000 +0200
-@@ -73,7 +73,7 @@
-   }
-   else if (l>0) {
-     data = mmap(0, l, PROT_READ, MAP_PRIVATE, fd, 0);
--    if (data==0) {
-+    if (data==MAP_FAILED) {
-       perror("mmap()");
-       exit(wrapper_exit_code);
-     }
-diff -Nru util-vserver-0.30.215.orig/src/h2ext.c util-vserver-0.30.215/src/h2ext.c
---- util-vserver-0.30.215.orig/src/h2ext.c	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/h2ext.c	2008-06-17 15:39:41.000000000 +0200
-@@ -148,7 +148,7 @@
-   fd = EopenD(file, O_RDONLY, 0);
-   Efstat(fd, &st);
-   mapping = mmap(NULL, MIN(st.st_size, MAX_PEEK_SIZE), PROT_READ, MAP_SHARED, fd, 0);
--  if (!mapping) {
-+  if (mapping == MAP_FAILED) {
-     perror("mmap()");
-     Eclose(fd);
-     return -1;
-diff -Nru util-vserver-0.30.215.orig/src/testsuite/hashcalc-plain.c util-vserver-0.30.215/src/testsuite/hashcalc-plain.c
---- util-vserver-0.30.215.orig/src/testsuite/hashcalc-plain.c	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/testsuite/hashcalc-plain.c	2008-06-17 15:40:08.000000000 +0200
-@@ -76,7 +76,7 @@
-     void const *		buf;
-     if (buf_size>HASH_BLOCKSIZE) buf_size = HASH_BLOCKSIZE;
- 
--    assert((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))!=0);
-+    assert((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))!=MAP_FAILED);
-     offset += buf_size;
-     assert(ensc_crypto_hashctx_update(&hash_context, buf, buf_size)!=-1);
-     munmap((void *)(buf), buf_size);
-diff -Nru util-vserver-0.30.215.orig/src/vhashify.c util-vserver-0.30.215/src/vhashify.c
---- util-vserver-0.30.215.orig/src/vhashify.c	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/vhashify.c	2008-06-17 15:40:28.000000000 +0200
-@@ -332,7 +332,7 @@
-       buf_size = size-offset;
-       if (buf_size>HASH_BLOCKSIZE) buf_size = HASH_BLOCKSIZE;
- 
--      if ((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))==0) {
-+      if ((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))==MAP_FAILED) {
- 	perror("mmap(<hash>)");
- 	goto out;
-       }
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-capget.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-capget.patch
deleted file mode 100644
index 3452d6b1c79a..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-capget.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: /trunk/src/vserver-info.c
-===================================================================
---- a/src/vserver-info.c (revision 2589)
-+++ b/src/vserver-info.c (revision 2717)
-@@ -186,7 +186,9 @@
- verifyCap()
- {
-+  int retried = 0;
-   struct __user_cap_header_struct header;
--  struct __user_cap_data_struct user;
--  header.version = _LINUX_CAPABILITY_VERSION;
-+  struct __user_cap_data_struct user[2];
-+
-+  header.version = _LINUX_CAPABILITY_VERSION_2;
-   header.pid     = 0;
- 
-@@ -200,15 +202,22 @@
- //    return false;
- //  }
--  
--  if (capget(&header, &user)==-1) {
-+
-+retry:
-+  if (capget(&header, user)==-1) {
-+    if (!retried &&
-+	header.version != _LINUX_CAPABILITY_VERSION_2) {
-+      header.version = _LINUX_CAPABILITY_VERSION_1;
-+      retried = 1;
-+      goto retry;
-+    }
-     perror("capget()");
-     return false;
-   }
- 
--  user.effective   = 0;
--  user.permitted   = 0;
--  user.inheritable = 0;
--
--  if (capset(&header, &user)==-1) {
-+  user[0].effective   = user[1].effective   = 0;
-+  user[0].permitted   = user[1].permitted   = 0;
-+  user[0].inheritable = user[1].inheritable = 0;
-+
-+  if (capset(&header, user)==-1) {
-     perror("capset()");
-     return false;
-Index: /trunk/src/rpm-fake.c
-===================================================================
---- a/src/rpm-fake.c (revision 2693)
-+++ b/src/rpm-fake.c (revision 2717)
-@@ -420,20 +420,28 @@
- reduceCapabilities()
- {
-+  int retried = 0;
-   struct __user_cap_header_struct header;
--  struct __user_cap_data_struct user;
--  
--  header.version = _LINUX_CAPABILITY_VERSION;
-+  struct __user_cap_data_struct user[2];
-+  
-+  header.version = _LINUX_CAPABILITY_VERSION_2;
-   header.pid     = 0;
- 
--  if (capget(&header, &user)==-1) {
-+retry:
-+  if (capget(&header, user)==-1) {
-+    if (!retried &&
-+	header.version != _LINUX_CAPABILITY_VERSION_2) {
-+      header.version = _LINUX_CAPABILITY_VERSION_1;
-+      retried = 1;
-+      goto retry;
-+    }
-     perror("capget()");
-     exit(wrapper_exit_code);
-   }
- 
--  user.effective   &= ~(1<<CAP_MKNOD);
--  user.permitted   &= ~(1<<CAP_MKNOD);
--  user.inheritable &= ~(1<<CAP_MKNOD);
--
--  if (capset(&header, &user)==-1) {
-+  user[0].effective   &= ~(1<<CAP_MKNOD);
-+  user[0].permitted   &= ~(1<<CAP_MKNOD);
-+  user[0].inheritable &= ~(1<<CAP_MKNOD);
-+
-+  if (capset(&header, user)==-1) {
-     perror("capset()");
-     exit(wrapper_exit_code);
-Index: /trunk/src/capability-compat.h
-===================================================================
---- a/src/capability-compat.h (revision 1822)
-+++ b/src/capability-compat.h (revision 2717)
-@@ -30,2 +30,10 @@
- 
- #endif
-+
-+#ifndef _LINUX_CAPABILITY_VERSION_1
-+#  define _LINUX_CAPABILITY_VERSION_1	_LINUX_CAPABILITY_VERSION
-+#endif
-+
-+#ifndef _LINUX_CAPABILITY_VERSION_2
-+#  define _LINUX_CAPABILITY_VERSION_2	0x20071026
-+#endif
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch
deleted file mode 100644
index bb6342608c70..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nru util-vserver-0.30.215.orig/Makefile.in util-vserver-0.30.215/Makefile.in
---- util-vserver-0.30.215.orig/Makefile.in	2008-03-17 10:00:13.000000000 +0100
-+++ util-vserver-0.30.215/Makefile.in	2008-06-18 19:24:54.000000000 +0200
-@@ -1496,7 +1496,7 @@
- 	$(lib_internal_testsuite_sigbus_gnu_SOURCES) \
- 	$(src_capchroot_SOURCES) $(src_chain_echo_SOURCES) \
- 	$(src_chbind_compat_SOURCES) $(src_chcontext_compat_SOURCES) \
--	src/check-unixfile.c $(src_chroot_sh_SOURCES) \
-+	$(src_chroot_sh_SOURCES) \
- 	$(src_chxid_SOURCES) $(src_exec_cd_SOURCES) \
- 	$(src_exec_ulimit_SOURCES) $(src_fakerunlevel_SOURCES) \
- 	$(src_filetime_SOURCES) $(src_h2ext_SOURCES) \
-@@ -1818,7 +1818,7 @@
- 	ensc_fmt/lib_libvserver_a-% lib/testsuite/cflags \
- 	lib/testsuite/personality lib/testsuite/fmt \
- 	src/chcontext-compat src/capchroot src/chain-echo \
--	src/check-unixfile src/chroot-sh src/filetime src/lockfile \
-+	src/chroot-sh src/filetime src/lockfile \
- 	src/readlink src/secure-mount src/save_ctxinfo src/mask2prefix \
- 	src/chbind-compat src/exec-cd src/fakerunlevel \
- 	src/keep-ctx-alive src/exec-ulimit src/vps src/lsxid src/chxid \
-@@ -1828,7 +1828,7 @@
- 	src/vsched src/vshelper-sync src/vrsetup src/vserver-stat \
- 	src/vserver-info src/vdlimit src/vdu src/vwait src/ncontext \
- 	src/nattribute src/naddress src/vdevmap src/vsysctl src/vclone \
--	src/h2ext src/vtag src/vspace src/vmemctrl src/tunctl \
-+	src/vtag src/vspace src/vmemctrl src/tunctl \
- 	$(am__append_3) $(tests_dietprogs) \
- 	lib_internal/libinternal-diet.a \
- 	lib_internal/testsuite/isnumber lib_internal/testsuite/sigbus \
-diff -Nru util-vserver-0.30.215.orig/src/Makefile-files util-vserver-0.30.215/src/Makefile-files
---- util-vserver-0.30.215.orig/src/Makefile-files	2008-03-17 09:59:45.000000000 +0100
-+++ util-vserver-0.30.215/src/Makefile-files	2008-06-18 17:49:42.000000000 +0200
-@@ -38,7 +38,6 @@
- DIETPROGS +=		src/chcontext-compat \
- 			src/capchroot \
- 			src/chain-echo \
--			src/check-unixfile \
- 			src/chroot-sh \
- 			src/filetime \
- 			src/lockfile \
-@@ -81,7 +80,6 @@
- 			src/vdevmap \
- 			src/vsysctl \
- 			src/vclone \
--			src/h2ext \
- 			src/vtag \
- 			src/vspace \
- 			src/vmemctrl \
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch
deleted file mode 100644
index db4cf4b32f16..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: scripts/vserver-init.functions
-===================================================================
---- scripts/vserver-init.functions	(revision 2711)
-+++ scripts/vserver-init.functions	(revision 2712)
-@@ -21,7 +21,7 @@
-     _postResult() { echo; }
-     lockfile=/var/lock/subsys/$LOCKFILE
- elif test -e /etc/gentoo-release; then
--    . /sbin/functions.sh
-+    . /etc/init.d/functions.sh
-     _beginResult() { ebegin "$@"; }
-     _postResult() { :; }
-     success() { eend 0; }
-Index: distrib/gentoo/initpost
-===================================================================
---- distrib/gentoo/initpost	(revision 2711)
-+++ distrib/gentoo/initpost	(revision 2712)
-@@ -63,6 +63,11 @@
- if test "$initstyle" == "gentoo"; then
- 	echo ">>> Installing special init-style magic ... "
- 
-+	# force /lib/rc/sh even if we don't have it in older stages
-+	$_CHROOT_SH mkdir /lib 2>/dev/null || :
-+	$_CHROOT_SH mkdir /lib/rc 2/dev/null || :
-+	$_CHROOT_SH mkdir /lib/rc/sh 2/dev/null || :
-+
- 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
- 	$_CHROOT_SH truncate   /lib/rc/sh/init-vserver.sh
- 	$_CHROOT_SH chmod 0755 /lib/rc/sh/init-vserver.sh
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch
deleted file mode 100644
index 16078f31f9a2..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.215-typo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/distrib/gentoo/initpost
-===================================================================
---- trunk/distrib/gentoo/initpost (revision 2712)
-+++ trunk/distrib/gentoo/initpost (revision 2715)
-@@ -66,6 +66,6 @@
- 	# force /lib/rc/sh even if we don't have it in older stages
- 	$_CHROOT_SH mkdir /lib 2>/dev/null || :
--	$_CHROOT_SH mkdir /lib/rc 2/dev/null || :
--	$_CHROOT_SH mkdir /lib/rc/sh 2/dev/null || :
-+	$_CHROOT_SH mkdir /lib/rc 2>/dev/null || :
-+	$_CHROOT_SH mkdir /lib/rc/sh 2>/dev/null || :
- 
- 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild
deleted file mode 100644
index ee57e8020822..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild,v 1.5 2014/01/16 13:55:04 jer Exp $
-
-inherit eutils bash-completion
-
-MY_P=${P/_/-}
-S="${WORKDIR}"/${MY_P}
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~sparc x86"
-
-IUSE=""
-
-CDEPEND="dev-libs/beecrypt
-	net-firewall/iptables
-	net-misc/vconfig
-	sys-apps/iproute2
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
-
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-pkg_setup() {
-	if [[ -z "${VDIRBASE}" ]]; then
-		einfo
-		einfo "You can change the default vserver base directory (/vservers)"
-		einfo "by setting the VDIRBASE environment variable."
-	fi
-
-	: ${VDIRBASE:=/vservers}
-
-	einfo
-	einfo "Using \"${VDIRBASE}\" as vserver base directory"
-	einfo
-}
-
-src_compile() {
-	econf --with-vrootdir=${VDIRBASE} \
-		--with-initscripts=gentoo \
-		--localstatedir=/var || die "econf failed!"
-	emake || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-distribution \
-		|| die "make install failed!"
-
-	# keep dirs
-	keepdir /var/run/vservers
-	keepdir /var/run/vservers.rev
-	keepdir /var/run/vshelper
-	keepdir /var/lock/vservers
-	keepdir /var/cache/vservers
-	keepdir "${VDIRBASE}"
-	keepdir "${VDIRBASE}"/.pkg
-
-	# remove legacy config file
-	rm -f "${D}"/etc/vservers.conf
-
-	# bash-completion
-	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
-
-	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.30.211"
-	old_init_script_warn=$?
-}
-
-pkg_postinst() {
-	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
-	# present when merging.
-
-	[ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null
-	setattr --barrier "${VDIRBASE}" &> /dev/null
-
-	rm /etc/vservers/.defaults/vdirbase
-	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase
-
-	elog
-	elog "You have to run the vprocunhide command after every reboot"
-	elog "in order to setup /proc permissions correctly for vserver"
-	elog "use. An init script has been installed by this package."
-	elog "To use it you should add it to a runlevel:"
-	elog
-	elog " rc-update add vprocunhide default"
-	elog
-
-	if [[ $old_init_script_warn = 0 ]] ; then
-		ewarn "Please make sure, that you remove the old init-script from any"
-		ewarn "runlevel and remove it from your init.d dir!"
-		ewarn
-		ewarn "# rc-update del vservers"
-		ewarn "# rm -f ${ROOT}etc/init.d/vservers"
-		ewarn
-		ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
-		ewarn "have been merged upstream, and may now have a slightly"
-		ewarn "different syntax, i.e. you have to update scripts that"
-		ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
-		ewarn "and vdispatch-conf)"
-		ewarn
-		ewarn "Additionally the init scripts have changed and now use"
-		ewarn "upstream scripts as backend. An init script to start"
-		ewarn "virtual servers in the 'default' group/mark has been"
-		ewarn "installed by this ebuild:"
-		ewarn
-		ewarn "  rc-update add vservers.default default"
-		ewarn
-		ewarn "To start vservers in other groups/marks, you have to"
-		ewarn "symlink the default init script the same way you do"
-		ewarn "with net.* scripts:"
-		ewarn
-		ewarn "  ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
-		ewarn
-	fi
-}