From: Roy Marples <uberlord@gentoo.org>
Date: Thu, 26 Apr 2007 13:52:18 +0000 (+0000)
Subject: Punt old versions
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=764e4eeca2e1eaaaffd47b1bbc72cec58bcd7958;p=gentoo.git

Punt old versions
Package-Manager: portage-2.1.2.4
---

diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 1228b0913fef..0e83ca0fac36 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -18,14 +18,6 @@ AUX openvpn-2.1.init 3916 RMD160 349a3c7ab19d0bd8c53151b679c7d09a4273458a SHA1 7
 MD5 bedd5cca7423050b8acae253bb56267c files/openvpn-2.1.init 3916
 RMD160 349a3c7ab19d0bd8c53151b679c7d09a4273458a files/openvpn-2.1.init 3916
 SHA256 35547a1d8b923fa576c7aec187dcdce15271d447893f34172e14f24f088f733f files/openvpn-2.1.init 3916
-AUX openvpn-2.1_rc1-persistent.patch 1977 RMD160 44a70845a1dac1f169fdf5f45d927709389d3166 SHA1 04dd0226e9ca71a3d4fee4e9338c4a07206f3167 SHA256 e1e1426aee7b17e784a8477d5efef1a262afd9cd124950d6a8f314c17cdb95c4
-MD5 c5392cca1d5862f58bac2a8f40ed5b58 files/openvpn-2.1_rc1-persistent.patch 1977
-RMD160 44a70845a1dac1f169fdf5f45d927709389d3166 files/openvpn-2.1_rc1-persistent.patch 1977
-SHA256 e1e1426aee7b17e784a8477d5efef1a262afd9cd124950d6a8f314c17cdb95c4 files/openvpn-2.1_rc1-persistent.patch 1977
-AUX openvpn-2.1_rc2-freebsd.patch 2542 RMD160 4d265ed92b8878ca0df1bd7a99c068bac92ea059 SHA1 49a577737f8f0965cb0f079e651549b50901b0e6 SHA256 b8f38e4fa02b712ac41b530c0782548c2ba0dbae2bea1026908176ffe5bf003b
-MD5 5eaf6bc5a0efab7a03edadf5bb34e420 files/openvpn-2.1_rc2-freebsd.patch 2542
-RMD160 4d265ed92b8878ca0df1bd7a99c068bac92ea059 files/openvpn-2.1_rc2-freebsd.patch 2542
-SHA256 b8f38e4fa02b712ac41b530c0782548c2ba0dbae2bea1026908176ffe5bf003b files/openvpn-2.1_rc2-freebsd.patch 2542
 AUX openvpn.init 1461 RMD160 5b1e41f449e287fc2629c2ecef28f7437d10eb74 SHA1 756afc52a29aae1bc41e5eb43f5604e4d9e39112 SHA256 81782885fe6b65434404e4d5875071cb9a4c70914f25c71826290bb265ab109e
 MD5 8f8bae9823ceafe8b9a1ac24bb4a23da files/openvpn.init 1461
 RMD160 5b1e41f449e287fc2629c2ecef28f7437d10eb74 files/openvpn.init 1461
@@ -36,41 +28,15 @@ RMD160 71362f18bc14a3df45db065ab45213e7078d34b7 files/up.sh 1663
 SHA256 84ed2ca4e65b8b9e59d133bacc3064dda4f289b5d21488d7a5d984fb43df93b5 files/up.sh 1663
 DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA1 046f3811831a06e4fbc9c64544faaecf04547ae5 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003
 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e
-DIST openvpn-2.1_rc1.tar.gz 796620 RMD160 751d07c3b9b40cc3c9a1649ad8b10b9d889a5690 SHA1 252715678c8d2c5d708267e7947cf89242209f0a SHA256 b5eb4f0d4eda58aaa8b60eb1b2f1d1a0d55ca22e9b098a2f65b6f44abc1c9e11
-DIST openvpn-2.1_rc2.tar.gz 802075 RMD160 d9608869ceae3edb610a94b0076d8ac9c818663c SHA1 30e6983bb0cb8c28b89dc438c2804dcf7f70988d SHA256 696630de3b8a8308a508d7ee1965fc5f2d6487ecb3d75e19c249c76f70ebfcb4
 DIST openvpn-2.1_rc4.tar.gz 803125 RMD160 d9843c2fb6fda64b5cf9474f42b36068bb4cd845 SHA1 4a22e23e497b7f5269628b1f430207c700cd6ebf SHA256 5d14e101c40e396250727fae7ee9ab734edd4e6e7f55b8209e0e215423775ff3
 EBUILD openvpn-2.0.6.ebuild 4093 RMD160 74a26b728df0cb037d7a183df70b17f608bb7ee0 SHA1 e48a9042fa4c12e80e37bc25d58e957853e30037 SHA256 a701bbca55dca2d8bbc79514dbc0cd04bd8c2c27a9c258fd76c70f2e157eea2b
 MD5 9ec0d85641d0511f4096473e72035437 openvpn-2.0.6.ebuild 4093
 RMD160 74a26b728df0cb037d7a183df70b17f608bb7ee0 openvpn-2.0.6.ebuild 4093
 SHA256 a701bbca55dca2d8bbc79514dbc0cd04bd8c2c27a9c258fd76c70f2e157eea2b openvpn-2.0.6.ebuild 4093
-EBUILD openvpn-2.0.7-r1.ebuild 4209 RMD160 dae508905336b70cece9a98c6e63a51fac5b2f06 SHA1 4594b8a1b3348a5fd861d958c122fd36d083ce29 SHA256 2283f0b3a1013c6fd21341c1861e7faa11fe3ccd98b3e065ac0e417a1039f890
-MD5 15d33e45cf20f59bbea41b1359d03332 openvpn-2.0.7-r1.ebuild 4209
-RMD160 dae508905336b70cece9a98c6e63a51fac5b2f06 openvpn-2.0.7-r1.ebuild 4209
-SHA256 2283f0b3a1013c6fd21341c1861e7faa11fe3ccd98b3e065ac0e417a1039f890 openvpn-2.0.7-r1.ebuild 4209
 EBUILD openvpn-2.0.7-r2.ebuild 4209 RMD160 7cff44d003b838f39fb6428f04e987af318c61e5 SHA1 4e2b363017cd83bb08939757a2d3ae0bc8290532 SHA256 bd2dde4bea648850a10e1099cbdaa1bcfdd2b9fa7c5efad09c3a84d8620bdde5
 MD5 bf6061dcb0a385d7f8e12fef54c8fa85 openvpn-2.0.7-r2.ebuild 4209
 RMD160 7cff44d003b838f39fb6428f04e987af318c61e5 openvpn-2.0.7-r2.ebuild 4209
 SHA256 bd2dde4bea648850a10e1099cbdaa1bcfdd2b9fa7c5efad09c3a84d8620bdde5 openvpn-2.0.7-r2.ebuild 4209
-EBUILD openvpn-2.0.7.ebuild 4162 RMD160 cf115158028fb2e731850ef5d2891172ab8e59a1 SHA1 50a27a08d5f35a600e969db20929d11c67f35627 SHA256 42a63dd518d1ec54f8cb62e667520d046234d4d762c1114781c93753f709c0c9
-MD5 dc9f1b96eff9f49eb2148060cf889bd1 openvpn-2.0.7.ebuild 4162
-RMD160 cf115158028fb2e731850ef5d2891172ab8e59a1 openvpn-2.0.7.ebuild 4162
-SHA256 42a63dd518d1ec54f8cb62e667520d046234d4d762c1114781c93753f709c0c9 openvpn-2.0.7.ebuild 4162
-EBUILD openvpn-2.1_rc1-r1.ebuild 4721 RMD160 d28f62993516c6f3960b3c186fa17f3c9df09e74 SHA1 b08a9f3310f2e9cd4eff19c8e9c98833894cabb1 SHA256 4579e0f5eca9a7083978b5ac11aa64578f5da38829715c6d85506cf3e0e09e97
-MD5 1d3ea21bf9f0a0c1a78237d6e8b310a5 openvpn-2.1_rc1-r1.ebuild 4721
-RMD160 d28f62993516c6f3960b3c186fa17f3c9df09e74 openvpn-2.1_rc1-r1.ebuild 4721
-SHA256 4579e0f5eca9a7083978b5ac11aa64578f5da38829715c6d85506cf3e0e09e97 openvpn-2.1_rc1-r1.ebuild 4721
-EBUILD openvpn-2.1_rc1-r2.ebuild 4720 RMD160 45d15ecb288ec277dae0d418eb9392349044ae4e SHA1 247979a9dc466341021026621200cb07bab82e84 SHA256 495cdd4bf9bc6c9e1b2116b3f3666fb79992ac4f8c05af5f7efccb709c7d9f0b
-MD5 84829e7e3e3940aa063a1537d427ad61 openvpn-2.1_rc1-r2.ebuild 4720
-RMD160 45d15ecb288ec277dae0d418eb9392349044ae4e openvpn-2.1_rc1-r2.ebuild 4720
-SHA256 495cdd4bf9bc6c9e1b2116b3f3666fb79992ac4f8c05af5f7efccb709c7d9f0b openvpn-2.1_rc1-r2.ebuild 4720
-EBUILD openvpn-2.1_rc1.ebuild 4674 RMD160 74cc582adcc8f01839d7f19fba29e936ed18873e SHA1 7d28477fc4e636c9fe46c13d34608a3e347d04a1 SHA256 1a4548212c003c3784fe8ca1c0ad5f9d76e91b819b63aeda1606f62c9a6f9cbe
-MD5 46b837bceccbff3ba38def30957c1d07 openvpn-2.1_rc1.ebuild 4674
-RMD160 74cc582adcc8f01839d7f19fba29e936ed18873e openvpn-2.1_rc1.ebuild 4674
-SHA256 1a4548212c003c3784fe8ca1c0ad5f9d76e91b819b63aeda1606f62c9a6f9cbe openvpn-2.1_rc1.ebuild 4674
-EBUILD openvpn-2.1_rc2.ebuild 4692 RMD160 5b1ba9956e1682ce95e80fba38aacca68f3dc66d SHA1 f58ad83c7c72a87e7f8489fe6d6ccb800cbac13b SHA256 6fd7015b2d8bee4387d954b1109d4f05e055611160405667bb594f78602b8a47
-MD5 0a49a6e392de2a212454d7c2b1df8644 openvpn-2.1_rc2.ebuild 4692
-RMD160 5b1ba9956e1682ce95e80fba38aacca68f3dc66d openvpn-2.1_rc2.ebuild 4692
-SHA256 6fd7015b2d8bee4387d954b1109d4f05e055611160405667bb594f78602b8a47 openvpn-2.1_rc2.ebuild 4692
 EBUILD openvpn-2.1_rc4.ebuild 4641 RMD160 aabca1049040fff4c187210fa85a403901ff4cfd SHA1 407a65740b612095c1c9c310d2d083244ffe3c96 SHA256 25265bc166a63ff0ba494edf45e6b5fd61f4dac5e79500108c44c46c41b0c71a
 MD5 0e432cb63dbaa36f5cb3fdd60127b31d openvpn-2.1_rc4.ebuild 4641
 RMD160 aabca1049040fff4c187210fa85a403901ff4cfd openvpn-2.1_rc4.ebuild 4641
@@ -86,27 +52,9 @@ SHA256 408ca4fc4f58fa21e629582d0a44a759f9695a018479d70efbd3338b6bdbcfd6 metadata
 MD5 9b5501be21ae9235fea7d51ef84b644e files/digest-openvpn-2.0.6 241
 RMD160 3bca5f56e3526082debc843084ae21fe35e65f93 files/digest-openvpn-2.0.6 241
 SHA256 cc2c7e3423898778eb6f6b45bdd4ba18d2a20be748cfa8482eba4ca20c2f80bd files/digest-openvpn-2.0.6 241
-MD5 f8b2e9d63bd97591290f11cd6bf8ae2a files/digest-openvpn-2.0.7 241
-RMD160 95c02dbccbc539ab7e6c2947ef7d187c3be3b6ad files/digest-openvpn-2.0.7 241
-SHA256 a1f31a906a965a6209c5e248a0a36f80423f087dd519d8465503446f23f1446d files/digest-openvpn-2.0.7 241
-MD5 f8b2e9d63bd97591290f11cd6bf8ae2a files/digest-openvpn-2.0.7-r1 241
-RMD160 95c02dbccbc539ab7e6c2947ef7d187c3be3b6ad files/digest-openvpn-2.0.7-r1 241
-SHA256 a1f31a906a965a6209c5e248a0a36f80423f087dd519d8465503446f23f1446d files/digest-openvpn-2.0.7-r1 241
 MD5 f8b2e9d63bd97591290f11cd6bf8ae2a files/digest-openvpn-2.0.7-r2 241
 RMD160 95c02dbccbc539ab7e6c2947ef7d187c3be3b6ad files/digest-openvpn-2.0.7-r2 241
 SHA256 a1f31a906a965a6209c5e248a0a36f80423f087dd519d8465503446f23f1446d files/digest-openvpn-2.0.7-r2 241
-MD5 bb7afa7edeacc9e41966e22abf947db5 files/digest-openvpn-2.1_rc1 247
-RMD160 3d9aea0ae09e97b06c00e158b96ea1ec46cb4bcf files/digest-openvpn-2.1_rc1 247
-SHA256 cb762f95d659bb7f55c64f681b194e75afded7641d68a3528a2d80df14dc1a24 files/digest-openvpn-2.1_rc1 247
-MD5 bb7afa7edeacc9e41966e22abf947db5 files/digest-openvpn-2.1_rc1-r1 247
-RMD160 3d9aea0ae09e97b06c00e158b96ea1ec46cb4bcf files/digest-openvpn-2.1_rc1-r1 247
-SHA256 cb762f95d659bb7f55c64f681b194e75afded7641d68a3528a2d80df14dc1a24 files/digest-openvpn-2.1_rc1-r1 247
-MD5 bb7afa7edeacc9e41966e22abf947db5 files/digest-openvpn-2.1_rc1-r2 247
-RMD160 3d9aea0ae09e97b06c00e158b96ea1ec46cb4bcf files/digest-openvpn-2.1_rc1-r2 247
-SHA256 cb762f95d659bb7f55c64f681b194e75afded7641d68a3528a2d80df14dc1a24 files/digest-openvpn-2.1_rc1-r2 247
-MD5 4e6edc8bdbf202f43b1890187dccbf80 files/digest-openvpn-2.1_rc2 247
-RMD160 76774838f771c256015eeb6fc4b93377fdee5bb4 files/digest-openvpn-2.1_rc2 247
-SHA256 15e1ed9efad1bcc034ab4127b0baff5b56bb0ec62f716b02af1916cf5fffd90c files/digest-openvpn-2.1_rc2 247
 MD5 f3295811d606ffc384a3861793ecbfd9 files/digest-openvpn-2.1_rc4 247
 RMD160 f7bfbb353fa4725b3aa3495d3d8d8dd20fe5715d files/digest-openvpn-2.1_rc4 247
 SHA256 1694d94509e5896a5b6b373c556d13f7e5370de6a5360810c6c1b1f95202de12 files/digest-openvpn-2.1_rc4 247
diff --git a/net-misc/openvpn/files/digest-openvpn-2.0.7 b/net-misc/openvpn/files/digest-openvpn-2.0.7
deleted file mode 100644
index c534cdba1b47..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-2.0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 93528233f1f6d02fc18e2c00f82e0aca openvpn-2.0.7.tar.gz 665129
-RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 openvpn-2.0.7.tar.gz 665129
-SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e openvpn-2.0.7.tar.gz 665129
diff --git a/net-misc/openvpn/files/digest-openvpn-2.0.7-r1 b/net-misc/openvpn/files/digest-openvpn-2.0.7-r1
deleted file mode 100644
index c534cdba1b47..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-2.0.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 93528233f1f6d02fc18e2c00f82e0aca openvpn-2.0.7.tar.gz 665129
-RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 openvpn-2.0.7.tar.gz 665129
-SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e openvpn-2.0.7.tar.gz 665129
diff --git a/net-misc/openvpn/files/digest-openvpn-2.1_rc1 b/net-misc/openvpn/files/digest-openvpn-2.1_rc1
deleted file mode 100644
index 03a90a8e78bc..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-2.1_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b0773149ef9d93a0075dfa42b87042a0 openvpn-2.1_rc1.tar.gz 796620
-RMD160 751d07c3b9b40cc3c9a1649ad8b10b9d889a5690 openvpn-2.1_rc1.tar.gz 796620
-SHA256 b5eb4f0d4eda58aaa8b60eb1b2f1d1a0d55ca22e9b098a2f65b6f44abc1c9e11 openvpn-2.1_rc1.tar.gz 796620
diff --git a/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r1 b/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r1
deleted file mode 100644
index 03a90a8e78bc..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b0773149ef9d93a0075dfa42b87042a0 openvpn-2.1_rc1.tar.gz 796620
-RMD160 751d07c3b9b40cc3c9a1649ad8b10b9d889a5690 openvpn-2.1_rc1.tar.gz 796620
-SHA256 b5eb4f0d4eda58aaa8b60eb1b2f1d1a0d55ca22e9b098a2f65b6f44abc1c9e11 openvpn-2.1_rc1.tar.gz 796620
diff --git a/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r2 b/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r2
deleted file mode 100644
index 03a90a8e78bc..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b0773149ef9d93a0075dfa42b87042a0 openvpn-2.1_rc1.tar.gz 796620
-RMD160 751d07c3b9b40cc3c9a1649ad8b10b9d889a5690 openvpn-2.1_rc1.tar.gz 796620
-SHA256 b5eb4f0d4eda58aaa8b60eb1b2f1d1a0d55ca22e9b098a2f65b6f44abc1c9e11 openvpn-2.1_rc1.tar.gz 796620
diff --git a/net-misc/openvpn/files/digest-openvpn-2.1_rc2 b/net-misc/openvpn/files/digest-openvpn-2.1_rc2
deleted file mode 100644
index 51e1c6de80ed..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-2.1_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 853c81d2de51d85b5381d4c7f7f074e3 openvpn-2.1_rc2.tar.gz 802075
-RMD160 d9608869ceae3edb610a94b0076d8ac9c818663c openvpn-2.1_rc2.tar.gz 802075
-SHA256 696630de3b8a8308a508d7ee1965fc5f2d6487ecb3d75e19c249c76f70ebfcb4 openvpn-2.1_rc2.tar.gz 802075
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc1-persistent.patch b/net-misc/openvpn/files/openvpn-2.1_rc1-persistent.patch
deleted file mode 100644
index 2ffb4910089f..000000000000
--- a/net-misc/openvpn/files/openvpn-2.1_rc1-persistent.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -u openvpn-2.1_rc1/init.c /tmp/openvpn-2.1_rc1/init.c
---- openvpn-2.1_rc1/init.c	2006-10-15 23:30:20.000000000 +0100
-+++ openvpn-2.1_rc1/init.c	2006-11-08 13:25:04.136530544 +0000
-@@ -425,7 +425,8 @@
- 	msg (M_FATAL|M_OPTERR,
- 	     "options --mktun or --rmtun should only be used together with --dev");
-       tuncfg (options->dev, options->dev_type, options->dev_node,
--	      options->tun_ipv6, options->persist_mode);
-+	      options->tun_ipv6, options->persist_mode,
-+	      &options->tuntap_options);
-       if (options->persist_mode && options->lladdr)
-         set_lladdr(options->dev, options->lladdr, NULL);
-       return true;
-diff -u openvpn-2.1_rc1/tun.c /tmp/openvpn-2.1_rc1/tun.c
---- openvpn-2.1_rc1/tun.c	2006-10-15 23:30:20.000000000 +0100
-+++ openvpn-2.1_rc1/tun.c	2006-11-08 13:25:04.129531608 +0000
-@@ -1163,13 +1163,14 @@
- #ifdef TUNSETPERSIST
- 
- void
--tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode)
-+tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode, const struct tuntap_options *options)
- {
-   struct tuntap *tt;
- 
-   ALLOC_OBJ (tt, struct tuntap);
-   clear_tuntap (tt);
-   tt->type = dev_type_enum (dev, dev_type);
-+  tt->options = *options;
-   open_tun (dev, dev_type, dev_node, ipv6, tt);
-   if (ioctl (tt->fd, TUNSETPERSIST, persist_mode) < 0)
-     msg (M_ERR, "Cannot ioctl TUNSETPERSIST(%d) %s", persist_mode, dev);
-diff -u openvpn-2.1_rc1/tun.h /tmp/openvpn-2.1_rc1/tun.h
---- openvpn-2.1_rc1/tun.h	2006-10-15 23:30:20.000000000 +0100
-+++ openvpn-2.1_rc1/tun.h	2006-11-08 13:25:04.135530696 +0000
-@@ -204,7 +204,7 @@
- int read_tun (struct tuntap* tt, uint8_t *buf, int len);
- 
- void tuncfg (const char *dev, const char *dev_type, const char *dev_node,
--	     bool ipv6, int persist_mode);
-+	     bool ipv6, int persist_mode, const struct tuntap_options *options);
- 
- const char *guess_tuntap_dev (const char *dev,
- 			      const char *dev_type,
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc2-freebsd.patch b/net-misc/openvpn/files/openvpn-2.1_rc2-freebsd.patch
deleted file mode 100644
index e6bdcd7d3d6f..000000000000
--- a/net-misc/openvpn/files/openvpn-2.1_rc2-freebsd.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur openvpn-2.1_rc2.orig/configure.ac openvpn-2.1_rc2/configure.ac
---- openvpn-2.1_rc2.orig/configure.ac	2007-02-28 07:34:32 +0000
-+++ openvpn-2.1_rc2/configure.ac	2007-03-05 11:17:24 +0000
-@@ -284,12 +284,44 @@
- 		 sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h dnl
- 		 stdarg.h unistd.h signal.h stdio.h string.h dnl
- 		 strings.h ctype.h errno.h syslog.h pwd.h grp.h dnl
--		 net/if_tun.h net/if.h stropts.h sys/sockio.h dnl
--		 netinet/in.h netinet/in_systm.h netinet/ip.h dnl
--		 netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h dnl
-+		 net/if_tun.h stropts.h sys/sockio.h dnl
-+		 netinet/in.h netinet/in_systm.h dnl
-+		 netinet/tcp.h arpa/inet.h dnl
- 		 netdb.h sys/uio.h linux/if_tun.h linux/sockios.h dnl
- 		 linux/types.h sys/poll.h sys/epoll.h err.h dnl
- )
-+AC_CHECK_HEADERS(net/if.h,,,
-+		 [#ifdef HAVE_SYS_SOCKET_H 
-+		  # include <sys/socket.h>
-+		  #endif
-+		 ])
-+AC_CHECK_HEADERS(netinet/ip.h,,,
-+		 [#ifdef HAVE_SYS_TYPES_H
-+		  # include <sys/types.h>
-+		  #endif
-+		  #ifdef HAVE_NETINET_IN_H
-+		  # include <netinet/in.h>
-+		  #endif
-+		  #ifdef HAVE_NETINET_IN_SYSTM_H
-+		  # include <netinet/in_systm.h>
-+		  #endif
-+		 ])
-+AC_CHECK_HEADERS(netinet/if_ether.h,,,
-+		 [#ifdef HAVE_SYS_TYPES_H
-+		  # include <sys/types.h>
-+		  #endif
-+		  #ifdef HAVE_SYS_SOCKET_H
-+		  # include <sys/socket.h>
-+		  #endif
-+		  #ifdef HAVE_NETINET_IN_H
-+		  # include <netinet/in.h>
-+		  #endif
-+		 ])
-+AC_CHECK_HEADERS(resolv.h,,,
-+		 [#ifdef HAVE_NETINET_IN_H 
-+		  # include <netinet/in.h>
-+		  #endif
-+		 ])
- AC_CHECK_HEADERS(linux/errqueue.h,,,
- 	[#ifdef HAVE_LINUX_TYPES_H
- 	 # include <linux/types.h>
-diff -ur openvpn-2.1_rc2.orig/easy-rsa/2.0/Makefile openvpn-2.1_rc2/easy-rsa/2.0/Makefile
---- openvpn-2.1_rc2.orig/easy-rsa/2.0/Makefile	2006-10-15 23:30:18 +0100
-+++ openvpn-2.1_rc2/easy-rsa/2.0/Makefile	2007-03-05 11:17:29 +0000
-@@ -7,7 +7,7 @@
- 	echo "Run make install DESTDIR=/usr/share/somewhere"
- 
- install:
--	install -c --directory "${DESTDIR}/${PREFIX}"
--	install -c --mode=0755 build-* "${DESTDIR}/${PREFIX}"
--	install -c --mode=0755 clean-all list-crl inherit-inter pkitool revoke-full sign-req whichopensslcnf "${DESTDIR}/${PREFIX}"
--	install -c --mode=0644 openssl-0.9.6.cnf openssl.cnf README vars "${DESTDIR}/${PREFIX}"
-+	install -d "${DESTDIR}/${PREFIX}"
-+	install -m 0755 build-* "${DESTDIR}/${PREFIX}"
-+	install -m 0755 clean-all list-crl inherit-inter pkitool revoke-full sign-req whichopensslcnf "${DESTDIR}/${PREFIX}"
-+	install -m 0644 openssl-0.9.6.cnf openssl.cnf README vars "${DESTDIR}/${PREFIX}"
diff --git a/net-misc/openvpn/openvpn-2.0.7-r1.ebuild b/net-misc/openvpn/openvpn-2.0.7-r1.ebuild
deleted file mode 100644
index 532bde45ec33..000000000000
--- a/net-misc/openvpn/openvpn-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7-r1.ebuild,v 1.4 2007/04/16 11:43:26 uberlord Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
-
-RDEPEND=">=dev-libs/lzo-1.07
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
-	)
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-pkg_setup() {
-	if use iproute2 ; then
-		if built_with_use sys-apps/iproute2 minimal ; then
-			eerror "iproute2 support requires that sys-apps/iproute2 was not"
-			eerror "built with the minimal USE flag"
-			die "iproute2 support not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
-	epatch "${FILESDIR}/${P}-pam.patch"
-	epatch "${FILESDIR}/${P}-persistent.patch"
-
-}
-
-src_compile() {
-	local myconf=""
-	# We cannot use use_enable with iproute2 as the Makefile stupidly
-	# enables it with --disable-iproute2
-	use iproute2 && myconf="${myconf} --enable-iproute2"
-	use minimal && myconf="${myconf} --disable-plugins"
-
-	econf ${myconf} \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable threads pthread) \
-		|| die "configure failed"
-
-	use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in $( ls 2>/dev/null ); do
-			[[ ${i} == "README" || ${i} == "examples" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			cd "${i}"
-			emake || die "make failed"
-			cd ..
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Empty dir
-	dodir /etc/openvpn
-	keepdir /etc/openvpn
-
-	# Install the init script
-	newinitd "${FILESDIR}/openvpn.init" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
-		prepalldocs
-	fi
-
-	# Install plugins and easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		exeinto "/usr/share/${PN}/easy-rsa"
-		doexe *-* pkitool
-		insinto "/usr/share/${PN}/easy-rsa"
-		doins README openssl.cnf vars
-		cd ../..
-
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
-	fi
-}
-
-pkg_postinst() {
-	ewarn "WARNING: The openvpn init script has changed"
-	ewarn ""
-	einfo "The openvpn init script expects to find the configuration file"
-	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	einfo ""
-	einfo "To create more VPNs, simply create a new .conf file for it and"
-	einfo "then create a symlink to the openvpn init script from a link called"
-	einfo "openvpn.newconfname - like so"
-	einfo "   cd /etc/openvpn"
-	einfo "   ${EDITOR##*/} foo.conf"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s openvpn openvpn.foo"
-	einfo ""
-	einfo "You can then treat openvpn.foo as any other service, so you can"
-	einfo "stop one vpn and start another if you need to."
-	if ! use minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-	einfo ""
-	einfo "It is recommended that you create your tun/tap interfaces using"
-	einfo "the net.tun0/net.tap0 scripts provided by baselayout instead of"
-	einfo "using the 'server' directive in openvpn configuration files."
-	einfo "This will insure that the interface really is up after openvpn"
-	einfo "starts."
-	einfo "Note that you cannot use net.tun0/net.tap0 and the server option,"
-	einfo "otherwise openvpn will not start."
-	ebeep
-}
diff --git a/net-misc/openvpn/openvpn-2.0.7.ebuild b/net-misc/openvpn/openvpn-2.0.7.ebuild
deleted file mode 100644
index fda2959a6915..000000000000
--- a/net-misc/openvpn/openvpn-2.0.7.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7.ebuild,v 1.7 2007/04/16 11:43:26 uberlord Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
-
-RDEPEND=">=dev-libs/lzo-1.07
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
-	)
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-pkg_setup() {
-	if use iproute2 ; then
-		if built_with_use sys-apps/iproute2 minimal ; then
-			eerror "iproute2 support requires that sys-apps/iproute2 was not"
-			eerror "built with the minimal USE flag"
-			die "iproute2 support not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
-	epatch "${FILESDIR}/${P}-pam.patch"
-
-}
-
-src_compile() {
-	local myconf=""
-	# We cannot use use_enable with iproute2 as the Makefile stupidly
-	# enables it with --disable-iproute2
-	use iproute2 && myconf="${myconf} --enable-iproute2"
-	use minimal && myconf="${myconf} --disable-plugins"
-
-	econf ${myconf} \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable threads pthread) \
-		|| die "configure failed"
-
-	use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in $( ls 2>/dev/null ); do
-			[[ ${i} == "README" || ${i} == "examples" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			cd "${i}"
-			emake || die "make failed"
-			cd ..
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Empty dir
-	dodir /etc/openvpn
-	keepdir /etc/openvpn
-
-	# Install the init script
-	newinitd "${FILESDIR}/openvpn.init" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
-		prepalldocs
-	fi
-
-	# Install plugins and easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		exeinto "/usr/share/${PN}/easy-rsa"
-		doexe *-* pkitool
-		insinto "/usr/share/${PN}/easy-rsa"
-		doins README openssl.cnf vars
-		cd ../..
-
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
-	fi
-}
-
-pkg_postinst() {
-	ewarn "WARNING: The openvpn init script has changed"
-	ewarn ""
-	einfo "The openvpn init script expects to find the configuration file"
-	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	einfo ""
-	einfo "To create more VPNs, simply create a new .conf file for it and"
-	einfo "then create a symlink to the openvpn init script from a link called"
-	einfo "openvpn.newconfname - like so"
-	einfo "   cd /etc/openvpn"
-	einfo "   ${EDITOR##*/} foo.conf"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s openvpn openvpn.foo"
-	einfo ""
-	einfo "You can then treat openvpn.foo as any other service, so you can"
-	einfo "stop one vpn and start another if you need to."
-	if ! use minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-	einfo ""
-	einfo "It is recommended that you create your tun/tap interfaces using"
-	einfo "the net.tun0/net.tap0 scripts provided by baselayout instead of"
-	einfo "using the 'server' directive in openvpn configuration files."
-	einfo "This will insure that the interface really is up after openvpn"
-	einfo "starts."
-	einfo "Note that you cannot use net.tun0/net.tap0 and the server option,"
-	einfo "otherwise openvpn will not start."
-	ebeep
-}
diff --git a/net-misc/openvpn/openvpn-2.1_rc1-r1.ebuild b/net-misc/openvpn/openvpn-2.1_rc1-r1.ebuild
deleted file mode 100644
index 0dbe6bc74b32..000000000000
--- a/net-misc/openvpn/openvpn-2.1_rc1-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc1-r1.ebuild,v 1.3 2007/01/05 09:03:15 flameeyes Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
-
-DEPEND=">=dev-libs/lzo-1.07
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
-	)
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-pkg_setup() {
-	if use iproute2 ; then
-		if built_with_use sys-apps/iproute2 minimal ; then
-			eerror "iproute2 support requires that sys-apps/iproute2 was not"
-			eerror "built with the minimal USE flag"
-			die "iproute2 support not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
-	epatch "${FILESDIR}/${PN}"-2.0.7-pam.patch
-	epatch "${FILESDIR}/${P}"-persistent.patch
-
-}
-
-src_compile() {
-	local myconf=""
-	# We cannot use use_enable with iproute2 as the Makefile stupidly
-	# enables it with --disable-iproute2
-	use iproute2 && myconf="${myconf} --enable-iproute2"
-	if use minimal ; then
-		myconf="${myconf} --disable-plugins"
-		myconf="${myconf} --disable-pkcs11"
-	fi
-
-	econf ${myconf} \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable threads pthread) \
-		|| die "configure failed"
-
-	use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in $( ls 2>/dev/null ); do
-			[[ ${i} == "README" || ${i} == "examples" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			cd "${i}"
-			emake || die "make failed"
-			cd ..
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Empty dir
-	dodir /etc/openvpn
-	keepdir /etc/openvpn
-
-	# Install some helper scripts
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script
-	newinitd "${FILESDIR}/openvpn-2.1.init" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
-		prepalldocs
-	fi
-
-	# Install plugins and easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
-		cd ../..
-
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
-	fi
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [[ -n $(ls /etc/openvpn/*/local.conf 2>/dev/null) ]] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	einfo "The openvpn init script expects to find the configuration file"
-	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	einfo ""
-	einfo "To create more VPNs, simply create a new .conf file for it and"
-	einfo "then create a symlink to the openvpn init script from a link called"
-	einfo "openvpn.newconfname - like so"
-	einfo "   cd /etc/openvpn"
-	einfo "   ${EDITOR##*/} foo.conf"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s openvpn openvpn.foo"
-	einfo ""
-	einfo "You can then treat openvpn.foo as any other service, so you can"
-	einfo "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" ${ROOT}/etc/openvpn/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if ! use minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	if use userland_BSD ; then
-		ewarn ""
-		ewarn "If you run any kind of firewall on BSD and use IPv6 acrosss"
-		ewarn "OpenVPN then you'll probably have to lower the MTU to 1420"
-		ewarn "using the tun-mtu statement (even for tap devices)"
-	fi
-}
diff --git a/net-misc/openvpn/openvpn-2.1_rc1-r2.ebuild b/net-misc/openvpn/openvpn-2.1_rc1-r2.ebuild
deleted file mode 100644
index 14e016d38a34..000000000000
--- a/net-misc/openvpn/openvpn-2.1_rc1-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc1-r2.ebuild,v 1.1 2007/02/23 11:44:20 uberlord Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
-
-DEPEND=">=dev-libs/lzo-1.07
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
-	)
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-pkg_setup() {
-	if use iproute2 ; then
-		if built_with_use sys-apps/iproute2 minimal ; then
-			eerror "iproute2 support requires that sys-apps/iproute2 was not"
-			eerror "built with the minimal USE flag"
-			die "iproute2 support not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
-	epatch "${FILESDIR}/${PN}"-2.0.7-pam.patch
-	epatch "${FILESDIR}/${P}"-persistent.patch
-
-}
-
-src_compile() {
-	local myconf=""
-	# We cannot use use_enable with iproute2 as the Makefile stupidly
-	# enables it with --disable-iproute2
-	use iproute2 && myconf="${myconf} --enable-iproute2"
-	if use minimal ; then
-		myconf="${myconf} --disable-plugins"
-		myconf="${myconf} --disable-pkcs11"
-	fi
-
-	econf ${myconf} \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable threads pthread) \
-		|| die "configure failed"
-
-	use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in $( ls 2>/dev/null ); do
-			[[ ${i} == "README" || ${i} == "examples" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			cd "${i}"
-			emake || die "make failed"
-			cd ..
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Empty dir
-	dodir /etc/openvpn
-	keepdir /etc/openvpn
-
-	# Install some helper scripts
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script
-	newinitd "${FILESDIR}/openvpn-2.1.init" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
-		prepalldocs
-	fi
-
-	# Install plugins and easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
-		cd ../..
-
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
-	fi
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [[ -n $(ls /etc/openvpn/*/local.conf 2>/dev/null) ]] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	einfo "The openvpn init script expects to find the configuration file"
-	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	einfo ""
-	einfo "To create more VPNs, simply create a new .conf file for it and"
-	einfo "then create a symlink to the openvpn init script from a link called"
-	einfo "openvpn.newconfname - like so"
-	einfo "   cd /etc/openvpn"
-	einfo "   ${EDITOR##*/} foo.conf"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s openvpn openvpn.foo"
-	einfo ""
-	einfo "You can then treat openvpn.foo as any other service, so you can"
-	einfo "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" ${ROOT}/etc/openvpn/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if ! use minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	if use userland_BSD ; then
-		ewarn ""
-		ewarn "If you run any kind of firewall on BSD and use IPv6 acrosss"
-		ewarn "OpenVPN then you'll probably have to lower the MTU to 1420"
-		ewarn "using the tun-mtu statement (even for tap devices)"
-	fi
-}
diff --git a/net-misc/openvpn/openvpn-2.1_rc1.ebuild b/net-misc/openvpn/openvpn-2.1_rc1.ebuild
deleted file mode 100644
index dfe888e9cea4..000000000000
--- a/net-misc/openvpn/openvpn-2.1_rc1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc1.ebuild,v 1.4 2007/01/05 09:03:15 flameeyes Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
-
-DEPEND=">=dev-libs/lzo-1.07
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
-	)
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-pkg_setup() {
-	if use iproute2 ; then
-		if built_with_use sys-apps/iproute2 minimal ; then
-			eerror "iproute2 support requires that sys-apps/iproute2 was not"
-			eerror "built with the minimal USE flag"
-			die "iproute2 support not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
-	epatch "${FILESDIR}/${PN}"-2.0.7-pam.patch
-
-}
-
-src_compile() {
-	local myconf=""
-	# We cannot use use_enable with iproute2 as the Makefile stupidly
-	# enables it with --disable-iproute2
-	use iproute2 && myconf="${myconf} --enable-iproute2"
-	if use minimal ; then
-		myconf="${myconf} --disable-plugins"
-		myconf="${myconf} --disable-pkcs11"
-	fi
-
-	econf ${myconf} \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable threads pthread) \
-		|| die "configure failed"
-
-	use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in $( ls 2>/dev/null ); do
-			[[ ${i} == "README" || ${i} == "examples" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			cd "${i}"
-			emake || die "make failed"
-			cd ..
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Empty dir
-	dodir /etc/openvpn
-	keepdir /etc/openvpn
-
-	# Install some helper scripts
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script
-	newinitd "${FILESDIR}/openvpn-2.1.init" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
-		prepalldocs
-	fi
-
-	# Install plugins and easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
-		cd ../..
-
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
-	fi
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [[ -n $(ls /etc/openvpn/*/local.conf 2>/dev/null) ]] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	einfo "The openvpn init script expects to find the configuration file"
-	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	einfo ""
-	einfo "To create more VPNs, simply create a new .conf file for it and"
-	einfo "then create a symlink to the openvpn init script from a link called"
-	einfo "openvpn.newconfname - like so"
-	einfo "   cd /etc/openvpn"
-	einfo "   ${EDITOR##*/} foo.conf"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s openvpn openvpn.foo"
-	einfo ""
-	einfo "You can then treat openvpn.foo as any other service, so you can"
-	einfo "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" ${ROOT}/etc/openvpn/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if ! use minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	if use userland_BSD ; then
-		ewarn ""
-		ewarn "If you run any kind of firewall on BSD and use IPv6 acrosss"
-		ewarn "OpenVPN then you'll probably have to lower the MTU to 1420"
-		ewarn "using the tun-mtu statement (even for tap devices)"
-	fi
-}
diff --git a/net-misc/openvpn/openvpn-2.1_rc2.ebuild b/net-misc/openvpn/openvpn-2.1_rc2.ebuild
deleted file mode 100644
index c7b1117b9671..000000000000
--- a/net-misc/openvpn/openvpn-2.1_rc2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc2.ebuild,v 1.2 2007/04/16 11:43:26 uberlord Exp $
-
-inherit autotools eutils multilib
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
-
-DEPEND=">=dev-libs/lzo-1.07
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
-	)
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-pkg_setup() {
-	if use iproute2 ; then
-		if built_with_use sys-apps/iproute2 minimal ; then
-			eerror "iproute2 support requires that sys-apps/iproute2 was not"
-			eerror "built with the minimal USE flag"
-			die "iproute2 support not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
-	epatch "${FILESDIR}/${P}"-freebsd.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-	# We cannot use use_enable with iproute2 as the Makefile stupidly
-	# enables it with --disable-iproute2
-	use iproute2 && myconf="${myconf} --enable-iproute2"
-	if use minimal ; then
-		myconf="${myconf} --disable-plugins"
-		myconf="${myconf} --disable-pkcs11"
-	fi
-
-	econf ${myconf} \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable threads pthread) \
-		|| die "configure failed"
-
-	use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in $( ls 2>/dev/null ); do
-			[[ ${i} == "README" || ${i} == "examples" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			cd "${i}"
-			emake || die "make failed"
-			cd ..
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Empty dir
-	dodir /etc/openvpn
-	keepdir /etc/openvpn
-
-	# Install some helper scripts
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script
-	newinitd "${FILESDIR}/openvpn-2.1.init" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
-		prepalldocs
-	fi
-
-	# Install plugins and easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
-		cd ../..
-
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
-	fi
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [[ -n $(ls /etc/openvpn/*/local.conf 2>/dev/null) ]] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	einfo "The openvpn init script expects to find the configuration file"
-	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	einfo ""
-	einfo "To create more VPNs, simply create a new .conf file for it and"
-	einfo "then create a symlink to the openvpn init script from a link called"
-	einfo "openvpn.newconfname - like so"
-	einfo "   cd /etc/openvpn"
-	einfo "   ${EDITOR##*/} foo.conf"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s openvpn openvpn.foo"
-	einfo ""
-	einfo "You can then treat openvpn.foo as any other service, so you can"
-	einfo "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" ${ROOT}/etc/openvpn/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if ! use minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	if use userland_BSD ; then
-		ewarn ""
-		ewarn "If you run any kind of firewall on BSD and use IPv6 acrosss"
-		ewarn "OpenVPN then you'll probably have to lower the MTU to 1420"
-		ewarn "using the tun-mtu statement (even for tap devices)"
-	fi
-}