old

Package-Manager: portage-2.1.2_rc1-r3

9 files changed, 10 insertions, 758 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 801af91561cf..2d1f56606eae 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openssh-3.9_p1-chroot.patch 3026 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 SHA1 78f85bc81c0034e03d06dd3c7ab91b9210fc18fb SHA256 014158a32c707b2a79ac606aeefb6bc09f24c3f07ce5df353ddad96095518597
 MD5 c4edd6a7aa1418ce5bf74aeb46627dbf files/openssh-3.9_p1-chroot.patch 3026
 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 files/openssh-3.9_p1-chroot.patch 3026
@@ -169,9 +172,7 @@ DIST openssh-4.2p1+SecurID_v1.3.2.patch 616248 RMD160 71edbd3bd63b81d65ca7e755d0
 DIST openssh-4.2p1+x509-5.5.diff.gz 133405 RMD160 fba6bc99857d890cda0e5a88bf195b7e327f0aff SHA1 f1a71d8ed9e3a769d559faedce88ec1c72f86961 SHA256 42509cdd9edce6e6f2cb635cb480bfc0e3c0f26a0747760559742355a8b1ddce
 DIST openssh-4.2p1-hpn11.diff 14765 RMD160 c3cd4cbb53094fb1f248a780c3e5a05af2585f88 SHA1 7a8af1ce909bfee6ac9d498834a503fdae928b88 SHA256 0819c71dd48805ae0015b1744d9da746a71df4fac11b88cac227e7d9a991e46a
 DIST openssh-4.2p1.tar.gz 914165 RMD160 e1f45333e66d0afceb9934ab73401b4ca06f03a6 SHA1 5e7231cfa8ec673ea856ce291b78fac8b380eb78 SHA256 2a61e84b36958c0af19e4f6f9f3e27f8ed432a5188d654e26602402fd4047f6d
-DIST openssh-4.3p1+x509-5.3.diff.gz 131152 RMD160 48caf99a07cf6b1be1915d6dbec9d1ef015ba24c SHA1 1fcb71622865f99665aef97e4a806f76a8a5c03d SHA256 501b3b704081ee26295964d69d120f9825e93d9b33ab5abb1b417c40815e5642
 DIST openssh-4.3p1-hpn11.diff 11024 RMD160 c3b807437fd9f40f2ab73c52586de194b84cce6e SHA1 22f2c99d314abc400bd1731d9c35b0540cbf2eae SHA256 0a0b0e07bd845fdbf2112769c426a3b47b795076c8459f6dbc3e7c9060abb740
-DIST openssh-4.3p1.tar.gz 940777 RMD160 c1d69873ecc453b40d825a2f1b3a0909da815f5e SHA1 b1f379127829e7e820955b2825130edd1601ba59 SHA256 7a4e356742190901e458b7526f91dfa24c66babbcd24d55cf7eac282266f5254
 DIST openssh-4.3p2+SecurID_v1.3.2.patch 47650 RMD160 90c719e8b7576d06bda5fdfb86287bfa577c5e1a SHA1 9de17a35680cd2021b22cbc231334c3cbcf02a3b SHA256 d6fc92a11c23f3fa0c77f50e6d76cb6c6635ae4907df724a12e460b90c90e988
 DIST openssh-4.3p2+x509-5.3.diff.gz 131147 RMD160 d42a7e14b72bf850b9898e3707582b4b345ca27b SHA1 dc8868a22b36a900228d47488dadba093b91048a SHA256 768c44ae60b57e7571843996255204c1678736fb16616e965844bda982ebd44d
 DIST openssh-4.3p2+x509-5.5.diff.gz 136017 RMD160 21069550bbb05ea22870da853f68ee9910b2b71e SHA1 a529280d38b9161c862f6a2f40886ab457477872 SHA256 b62ee8afd927d9c97367ac738be55464327deacabf803a610159a98c569e72ad
@@ -202,26 +203,10 @@ EBUILD openssh-4.2_p1-r1.ebuild 5417 RMD160 9972e84e89cbc4eeb570a4eb808102d8a092
 MD5 cb561ae050e1b3b24870c2315004a47a openssh-4.2_p1-r1.ebuild 5417
 RMD160 9972e84e89cbc4eeb570a4eb808102d8a092685a openssh-4.2_p1-r1.ebuild 5417
 SHA256 e1c867a0e83ad120a574dcc3f07a00fbdf22bea359500ed41b71be5db373eed9 openssh-4.2_p1-r1.ebuild 5417
-EBUILD openssh-4.3_p1.ebuild 5288 RMD160 b62e51dc7b0393192104eda07abff4781ccb47a5 SHA1 35d7e6bf2e796d0a4c8a0bea05e94c8ac04806cc SHA256 dd270971443b138675d756332c07a4826962507688d2851a5856de882984100e
-MD5 b195f69083fdd12d07028cf188b25fd9 openssh-4.3_p1.ebuild 5288
-RMD160 b62e51dc7b0393192104eda07abff4781ccb47a5 openssh-4.3_p1.ebuild 5288
-SHA256 dd270971443b138675d756332c07a4826962507688d2851a5856de882984100e openssh-4.3_p1.ebuild 5288
 EBUILD openssh-4.3_p2-r1.ebuild 5574 RMD160 d93ae64663af5f66a255a5fc5b9bd35fbae57ff2 SHA1 046f6ce5c43945fb48b84e80626ba2d37c2a053d SHA256 8c4d3ccfaeb3a8e415c4271c0be334aad662d4dd825edc0859029d35c5b8e905
 MD5 9fb1c05f0986b8167a47a05d8754e80b openssh-4.3_p2-r1.ebuild 5574
 RMD160 d93ae64663af5f66a255a5fc5b9bd35fbae57ff2 openssh-4.3_p2-r1.ebuild 5574
 SHA256 8c4d3ccfaeb3a8e415c4271c0be334aad662d4dd825edc0859029d35c5b8e905 openssh-4.3_p2-r1.ebuild 5574
-EBUILD openssh-4.3_p2-r2.ebuild 5636 RMD160 51e6cafacd7250dac487b9ce7e1baa74ef8575f0 SHA1 22f0945f597fd3cdfb35ea44cbb7f243c82ac106 SHA256 b8826a7e1a83a26d2d9ce3318e0dbbb86e1fe522fd7f447579f166da7c431339
-MD5 b8fe47224e3f6922350e72323fad75ca openssh-4.3_p2-r2.ebuild 5636
-RMD160 51e6cafacd7250dac487b9ce7e1baa74ef8575f0 openssh-4.3_p2-r2.ebuild 5636
-SHA256 b8826a7e1a83a26d2d9ce3318e0dbbb86e1fe522fd7f447579f166da7c431339 openssh-4.3_p2-r2.ebuild 5636
-EBUILD openssh-4.3_p2-r3.ebuild 5744 RMD160 f6e4806a26fc0510f7c45284ada5dce746441633 SHA1 832e657d8709a01e5dc700fef8c2ccfd5c490fef SHA256 18f263b594dfc74d2760fde44f7f994323450a85fd95bcb61fb0631778b7d517
-MD5 94e3cad88d80a60890dfdcbff1eec01d openssh-4.3_p2-r3.ebuild 5744
-RMD160 f6e4806a26fc0510f7c45284ada5dce746441633 openssh-4.3_p2-r3.ebuild 5744
-SHA256 18f263b594dfc74d2760fde44f7f994323450a85fd95bcb61fb0631778b7d517 openssh-4.3_p2-r3.ebuild 5744
-EBUILD openssh-4.3_p2-r4.ebuild 5960 RMD160 d276860b823cb9ef8a876e539d17607998353652 SHA1 dfe7e536a1546765d7b26b4b95b22897f3d2a838 SHA256 4e5dc39625500cc4a12e8d8cdfbc91280be3ad82d9aead8fa41b0afabd817fd5
-MD5 f764ddb368a1140907243ce303639ab5 openssh-4.3_p2-r4.ebuild 5960
-RMD160 d276860b823cb9ef8a876e539d17607998353652 openssh-4.3_p2-r4.ebuild 5960
-SHA256 4e5dc39625500cc4a12e8d8cdfbc91280be3ad82d9aead8fa41b0afabd817fd5 openssh-4.3_p2-r4.ebuild 5960
 EBUILD openssh-4.3_p2-r5.ebuild 5957 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2f65b SHA1 a301419eecde2a1c0f8d5bccefc860785dde703c SHA256 beb5826bd7e1fc08ddfead5d5fa2114cf653fde315cc0264219373ea480e848c
 MD5 8b4bf9176c47593391f6a25cf40ee932 openssh-4.3_p2-r5.ebuild 5957
 RMD160 77b9c4c5c6aed23d5ab63596aa9fd76d40a2f65b openssh-4.3_p2-r5.ebuild 5957
@@ -250,24 +235,19 @@ SHA256 6f4a5185bfd38cc7ce43893376b938d61785714d4f944ad3e46a23b62c7a8f58 files/di
 MD5 47334711b7a78bb943cd78836e93469b files/digest-openssh-4.2_p1-r1 1310
 RMD160 e5b5f4c70adf34f314fbfbd14c9d6486172d39b7 files/digest-openssh-4.2_p1-r1 1310
 SHA256 98aae4337b1eefe038032fbd1d2f5ad18d3f46342938327dbb40d158e6bc861c files/digest-openssh-4.2_p1-r1 1310
-MD5 23e7b2e496c7baf11438f26b49b84ae1 files/digest-openssh-4.3_p1 1027
-RMD160 dc2e2884a4b336a9cc3b0274c87dd9ca463b34c6 files/digest-openssh-4.3_p1 1027
-SHA256 ff5c5e97448cc9ed8a740281c50920695bcf5d14caa01ce3fe41b5fec70c5ed3 files/digest-openssh-4.3_p1 1027
 MD5 06d3caedc8e82f930b3c3267693bcff9 files/digest-openssh-4.3_p2-r1 1307
 RMD160 033bff6ace845b41da52bfc8cb63c88413967a24 files/digest-openssh-4.3_p2-r1 1307
 SHA256 4210237ac3ff08d3c6fa2094fbf37cca3fc91b22d2c728c653efb36f820054de files/digest-openssh-4.3_p2-r1 1307
-MD5 0d0254ed9210821ca64914bd75a158a0 files/digest-openssh-4.3_p2-r2 1343
-RMD160 956c689e98e6be7279d8cffab44e6182f20f6621 files/digest-openssh-4.3_p2-r2 1343
-SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/digest-openssh-4.3_p2-r2 1343
-MD5 0d0254ed9210821ca64914bd75a158a0 files/digest-openssh-4.3_p2-r3 1343
-RMD160 956c689e98e6be7279d8cffab44e6182f20f6621 files/digest-openssh-4.3_p2-r3 1343
-SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/digest-openssh-4.3_p2-r3 1343
-MD5 0d0254ed9210821ca64914bd75a158a0 files/digest-openssh-4.3_p2-r4 1343
-RMD160 956c689e98e6be7279d8cffab44e6182f20f6621 files/digest-openssh-4.3_p2-r4 1343
-SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/digest-openssh-4.3_p2-r4 1343
 MD5 0d0254ed9210821ca64914bd75a158a0 files/digest-openssh-4.3_p2-r5 1343
 RMD160 956c689e98e6be7279d8cffab44e6182f20f6621 files/digest-openssh-4.3_p2-r5 1343
 SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/digest-openssh-4.3_p2-r5 1343
 MD5 1640aac282df2ff3bbca8fd7e94bd891 files/digest-openssh-4.4_p1-r6 1334
 RMD160 31d7d0e9b09bd8837de83abe8ee24b7878df7d9a files/digest-openssh-4.4_p1-r6 1334
 SHA256 81ff3d47e3f63ad4d4c31f6208d7926654b98b6a7cf6d3b937847faae6117d0e files/digest-openssh-4.4_p1-r6 1334
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFT0+kamhnQswr0vIRAiHmAKCHYv489byWqzAgUUOv0j3DxFf/GQCeL6e5
+/oI1ZPgE9qP/h3UFKRKPM5M=
+=shSQ
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p1 b/net-misc/openssh/files/digest-openssh-4.3_p1
deleted file mode 100644
index add3b0da38c5..000000000000
--- a/net-misc/openssh/files/digest-openssh-4.3_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 097e7e8db2970e69e074454173f2215b openssh-4.3p1+x509-5.3.diff.gz 131152
-RMD160 48caf99a07cf6b1be1915d6dbec9d1ef015ba24c openssh-4.3p1+x509-5.3.diff.gz 131152
-SHA256 501b3b704081ee26295964d69d120f9825e93d9b33ab5abb1b417c40815e5642 openssh-4.3p1+x509-5.3.diff.gz 131152
-MD5 7dd2a6716b81da33af4ca960185fdd1b openssh-4.3p1-hpn11.diff 11024
-RMD160 c3b807437fd9f40f2ab73c52586de194b84cce6e openssh-4.3p1-hpn11.diff 11024
-SHA256 0a0b0e07bd845fdbf2112769c426a3b47b795076c8459f6dbc3e7c9060abb740 openssh-4.3p1-hpn11.diff 11024
-MD5 eaeb880b1b6c63b9a4d7c5b1e74727c4 openssh-4.3p1.tar.gz 940777
-RMD160 c1d69873ecc453b40d825a2f1b3a0909da815f5e openssh-4.3p1.tar.gz 940777
-SHA256 7a4e356742190901e458b7526f91dfa24c66babbcd24d55cf7eac282266f5254 openssh-4.3p1.tar.gz 940777
-MD5 d9eacb819a73daddb3d21ca7aa8e5c25 openssh-lpk-4.3p1-0.3.7.patch 60451
-RMD160 fda93b8ee3ef9b633947784fe84a9eed2acbd325 openssh-lpk-4.3p1-0.3.7.patch 60451
-SHA256 0bcfa28804caf685de2248ddc966666196f6df81d1d058066f2da17714518af4 openssh-lpk-4.3p1-0.3.7.patch 60451
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p2-r2 b/net-misc/openssh/files/digest-openssh-4.3_p2-r2
deleted file mode 100644
index adb9f80e2b55..000000000000
--- a/net-misc/openssh/files/digest-openssh-4.3_p2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 3611a21a0098c32416d4b8f75232c796 openssh-4.3p2+SecurID_v1.3.2.patch 47650
-RMD160 90c719e8b7576d06bda5fdfb86287bfa577c5e1a openssh-4.3p2+SecurID_v1.3.2.patch 47650
-SHA256 d6fc92a11c23f3fa0c77f50e6d76cb6c6635ae4907df724a12e460b90c90e988 openssh-4.3p2+SecurID_v1.3.2.patch 47650
-MD5 bc93a31436941ae32e7f9d20c592eca7 openssh-4.3p2+x509-5.5.diff.gz 136017
-RMD160 21069550bbb05ea22870da853f68ee9910b2b71e openssh-4.3p2+x509-5.5.diff.gz 136017
-SHA256 b62ee8afd927d9c97367ac738be55464327deacabf803a610159a98c569e72ad openssh-4.3p2+x509-5.5.diff.gz 136017
-MD5 41b69edab053387f5233798864fcec74 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-RMD160 34fd5390d602a9ab99edb25756318cc0dd842360 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-SHA256 14d8ec5601bf1977f583a45353213a2dc4e8a453e3fc9c7a65499d0645cc9063 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-MD5 7e9880ac20a9b9db0d3fea30a9ff3d46 openssh-4.3p2.tar.gz 941455
-RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 openssh-4.3p2.tar.gz 941455
-SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f openssh-4.3p2.tar.gz 941455
-MD5 d9eacb819a73daddb3d21ca7aa8e5c25 openssh-lpk-4.3p1-0.3.7.patch 60451
-RMD160 fda93b8ee3ef9b633947784fe84a9eed2acbd325 openssh-lpk-4.3p1-0.3.7.patch 60451
-SHA256 0bcfa28804caf685de2248ddc966666196f6df81d1d058066f2da17714518af4 openssh-lpk-4.3p1-0.3.7.patch 60451
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p2-r3 b/net-misc/openssh/files/digest-openssh-4.3_p2-r3
deleted file mode 100644
index adb9f80e2b55..000000000000
--- a/net-misc/openssh/files/digest-openssh-4.3_p2-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 3611a21a0098c32416d4b8f75232c796 openssh-4.3p2+SecurID_v1.3.2.patch 47650
-RMD160 90c719e8b7576d06bda5fdfb86287bfa577c5e1a openssh-4.3p2+SecurID_v1.3.2.patch 47650
-SHA256 d6fc92a11c23f3fa0c77f50e6d76cb6c6635ae4907df724a12e460b90c90e988 openssh-4.3p2+SecurID_v1.3.2.patch 47650
-MD5 bc93a31436941ae32e7f9d20c592eca7 openssh-4.3p2+x509-5.5.diff.gz 136017
-RMD160 21069550bbb05ea22870da853f68ee9910b2b71e openssh-4.3p2+x509-5.5.diff.gz 136017
-SHA256 b62ee8afd927d9c97367ac738be55464327deacabf803a610159a98c569e72ad openssh-4.3p2+x509-5.5.diff.gz 136017
-MD5 41b69edab053387f5233798864fcec74 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-RMD160 34fd5390d602a9ab99edb25756318cc0dd842360 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-SHA256 14d8ec5601bf1977f583a45353213a2dc4e8a453e3fc9c7a65499d0645cc9063 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-MD5 7e9880ac20a9b9db0d3fea30a9ff3d46 openssh-4.3p2.tar.gz 941455
-RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 openssh-4.3p2.tar.gz 941455
-SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f openssh-4.3p2.tar.gz 941455
-MD5 d9eacb819a73daddb3d21ca7aa8e5c25 openssh-lpk-4.3p1-0.3.7.patch 60451
-RMD160 fda93b8ee3ef9b633947784fe84a9eed2acbd325 openssh-lpk-4.3p1-0.3.7.patch 60451
-SHA256 0bcfa28804caf685de2248ddc966666196f6df81d1d058066f2da17714518af4 openssh-lpk-4.3p1-0.3.7.patch 60451
diff --git a/net-misc/openssh/files/digest-openssh-4.3_p2-r4 b/net-misc/openssh/files/digest-openssh-4.3_p2-r4
deleted file mode 100644
index adb9f80e2b55..000000000000
--- a/net-misc/openssh/files/digest-openssh-4.3_p2-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 3611a21a0098c32416d4b8f75232c796 openssh-4.3p2+SecurID_v1.3.2.patch 47650
-RMD160 90c719e8b7576d06bda5fdfb86287bfa577c5e1a openssh-4.3p2+SecurID_v1.3.2.patch 47650
-SHA256 d6fc92a11c23f3fa0c77f50e6d76cb6c6635ae4907df724a12e460b90c90e988 openssh-4.3p2+SecurID_v1.3.2.patch 47650
-MD5 bc93a31436941ae32e7f9d20c592eca7 openssh-4.3p2+x509-5.5.diff.gz 136017
-RMD160 21069550bbb05ea22870da853f68ee9910b2b71e openssh-4.3p2+x509-5.5.diff.gz 136017
-SHA256 b62ee8afd927d9c97367ac738be55464327deacabf803a610159a98c569e72ad openssh-4.3p2+x509-5.5.diff.gz 136017
-MD5 41b69edab053387f5233798864fcec74 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-RMD160 34fd5390d602a9ab99edb25756318cc0dd842360 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-SHA256 14d8ec5601bf1977f583a45353213a2dc4e8a453e3fc9c7a65499d0645cc9063 openssh-4.3p2-hpn12-gentoo.patch.bz2 13642
-MD5 7e9880ac20a9b9db0d3fea30a9ff3d46 openssh-4.3p2.tar.gz 941455
-RMD160 ccd5967e3296347e6dd2be43c3d6caacde2b6833 openssh-4.3p2.tar.gz 941455
-SHA256 4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f openssh-4.3p2.tar.gz 941455
-MD5 d9eacb819a73daddb3d21ca7aa8e5c25 openssh-lpk-4.3p1-0.3.7.patch 60451
-RMD160 fda93b8ee3ef9b633947784fe84a9eed2acbd325 openssh-lpk-4.3p1-0.3.7.patch 60451
-SHA256 0bcfa28804caf685de2248ddc966666196f6df81d1d058066f2da17714518af4 openssh-lpk-4.3p1-0.3.7.patch 60451
diff --git a/net-misc/openssh/openssh-4.3_p1.ebuild b/net-misc/openssh/openssh-4.3_p1.ebuild
deleted file mode 100644
index 9df791880ce5..000000000000
--- a/net-misc/openssh/openssh-4.3_p1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p1.ebuild,v 1.6 2006/06/27 01:09:53 vapier Exp $
-
-inherit eutils flag-o-matic ccc pam
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-X509_PATCH="${PARCH}+x509-5.3.diff.gz"
-SECURID_PATCH="" #${PARCH}+SecurID_v1.3.2.patch"
-LDAP_PATCH="${PARCH/-4.3/-lpk-4.3}-0.3.7.patch"
-HPN_PATCH="${PARCH}-hpn11.diff"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
-	X509? ( http://roumenpetrov.info/openssh/x509-5.3/${X509_PATCH} )
-	ldap? ( http://www.opendarwin.org/projects/openssh-lpk/files/${LDAP_PATCH} )"
-#	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard sftplogging hpn libedit"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sys-libs/libselinux )
-	skey? ( >=app-admin/skey-1.1.5-r1 )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
-	>=dev-libs/openssl-0.9.6d
-	>=sys-libs/zlib-1.2.3
-	smartcard? ( dev-libs/opensc )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	sys-devel/autoconf"
-PROVIDE="virtual/ssh"
-
-S=${WORKDIR}/${PARCH}
-
-src_unpack() {
-	unpack ${PARCH}.tar.gz
-	cd "${S}"
-
-	sed -i \
-		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
-		pathnames.h || die
-
-	epatch "${FILESDIR}"/openssh-4.3_p2-configure.patch #137921
-	use X509 && epatch "${DISTDIR}"/${X509_PATCH}
-	use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
-	use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch
-	epatch "${FILESDIR}"/openssh-4.2_p1-selinux.patch
-	use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
-	if ! use X509 ; then
-		if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then
-			epatch "${DISTDIR}"/${SECURID_PATCH}
-			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
-		fi
-		if use ldap ; then
-			use sftplogging \
-				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
-				|| epatch "${DISTDIR}"/${LDAP_PATCH}
-		fi
-	elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
-		ewarn "Sorry, x509 and smartcard/ldap don't get along"
-	fi
-	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
-
-	sed -i '/LD.*ssh-keysign/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid"
-
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys #skey configure code triggers this
-
-	local myconf
-	# make sure .sbss is large enough
-	use skey && use alpha && append-ldflags -mlarge-data
-	if use ldap ; then
-		filter-flags -funroll-loops
-		myconf="${myconf} --with-ldap"
-	fi
-	use selinux && append-flags -DWITH_SELINUX && append-ldflags -lselinux
-
-	if use static ; then
-		append-ldflags -static
-		use pam && ewarn "Disabling pam support becuse of static flag"
-		myconf="${myconf} --without-pam"
-	else
-		myconf="${myconf} $(use_with pam)"
-	fi
-
-	use ipv6 || myconf="${myconf} --with-ipv4-default"
-
-	econf \
-		--with-ldflags="${LDFLAGS}" \
-		--disable-strip \
-		--sysconfdir=/etc/ssh \
-		--libexecdir=/usr/$(get_libdir)/misc \
-		--datadir=/usr/share/openssh \
-		--disable-suid-ssh \
-		--with-privsep-path=/var/empty \
-		--with-privsep-user=sshd \
-		--with-md5-passwords \
-		$(use_with libedit) \
-		$(use_with kerberos kerberos5 /usr) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_with skey) \
-		$(use_with smartcard opensc) \
-		${myconf} \
-		|| die "bad configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install-nokeys DESTDIR="${D}" || die
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-	keepdir /var/empty
-
-	newpamd "${FILESDIR}"/sshd.pam_include sshd
-	dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
-	use pam \
-		&& dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
-		&& dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
-
-	doman contrib/ssh-copy-id.1
-	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-}
-
-pkg_postinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-
-	ewarn "Remember to merge your config files in /etc/ssh/ and then"
-	ewarn "restart sshd: '/etc/init.d/sshd restart'."
-	ewarn
-	einfo "As of version 3.4 the default is to enable the UsePrivelegeSeparation"
-	einfo "functionality, but please ensure that you do not explicitly disable"
-	einfo "this in your configuration as disabling it opens security holes"
-	einfo
-	einfo "This revision has removed your sshd user id and replaced it with a"
-	einfo "new one with UID 22.  If you have any scripts or programs that"
-	einfo "that referenced the old UID directly, you will need to update them."
-	einfo
-	if use pam ; then
-		einfo "Please be aware users need a valid shell in /etc/passwd"
-		einfo "in order to be allowed to login."
-		einfo
-	fi
-}
diff --git a/net-misc/openssh/openssh-4.3_p2-r2.ebuild b/net-misc/openssh/openssh-4.3_p2-r2.ebuild
deleted file mode 100644
index 1225e6177d6f..000000000000
--- a/net-misc/openssh/openssh-4.3_p2-r2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r2.ebuild,v 1.9 2006/09/08 04:37:14 vapier Exp $
-
-inherit eutils flag-o-matic ccc pam
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-X509_PATCH="${PARCH}+x509-5.5.diff.gz"
-SECURID_PATCH="${PARCH}+SecurID_v1.3.2.patch"
-LDAP_PATCH="${PARCH/-4.3p2/-lpk-4.3p1}-0.3.7.patch"
-HPN_PATCH="${PARCH}-hpn12-gentoo.patch.bz2"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
-	X509? ( http://roumenpetrov.info/openssh/x509-5.5/${X509_PATCH} )
-	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
-	ldap? ( http://www.opendarwin.org/projects/openssh-lpk/files/${LDAP_PATCH} )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard sftplogging hpn libedit X"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	skey? ( >=app-admin/skey-1.1.5-r1 )
-	ldap? ( net-nds/openldap )
-	libedit? ( || ( dev-libs/libedit sys-freebsd/freebsd-lib ) )
-	>=dev-libs/openssl-0.9.6d
-	>=sys-libs/zlib-1.2.3
-	smartcard? ( dev-libs/opensc )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	X? ( || ( x11-apps/xauth virtual/x11 ) )
-	userland_GNU? ( sys-apps/shadow )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-
-PROVIDE="virtual/ssh"
-
-S=${WORKDIR}/${PARCH}
-
-src_unpack() {
-	unpack ${PARCH}.tar.gz
-	cd "${S}"
-
-	sed -i \
-		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
-		pathnames.h || die
-
-	epatch "${FILESDIR}"/openssh-4.3_p2-configure.patch #137921
-	epatch "${FILESDIR}"/openssh-4.3_p1-krb5-typos.patch #124494
-	use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-x509-hpn-glue.patch
-	use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
-	use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch
-	if use X509 ; then
-		cp "${FILESDIR}"/openssh-4.3_p2-selinux.patch .
-		epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch.glue ./openssh-4.3_p2-selinux.patch
-	else
-		epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch
-	fi
-	use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
-	if ! use X509 ; then
-		if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then
-			epatch "${DISTDIR}"/${SECURID_PATCH} "${FILESDIR}"/${P}-securid-hpn-glue.patch
-			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
-		fi
-		if use ldap ; then
-			use sftplogging \
-				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
-				|| epatch "${DISTDIR}"/${LDAP_PATCH}
-		fi
-	elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
-		ewarn "Sorry, x509 and smartcard/ldap don't get along"
-	fi
-	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
-
-	sed -i '/LD.*ssh-keysign/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid"
-
-	sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
-
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys #skey configure code triggers this
-
-	local myconf=""
-	if use static ; then
-		append-ldflags -static
-		use pam && ewarn "Disabling pam support becuse of static flag"
-		myconf="${myconf} --without-pam"
-	else
-		myconf="${myconf} $(use_with pam)"
-	fi
-
-	use ipv6 || myconf="${myconf} --with-ipv4-default"
-
-	econf \
-		--with-ldflags="${LDFLAGS}" \
-		--disable-strip \
-		--sysconfdir=/etc/ssh \
-		--libexecdir=/usr/$(get_libdir)/misc \
-		--datadir=/usr/share/openssh \
-		--disable-suid-ssh \
-		--with-privsep-path=/var/empty \
-		--with-privsep-user=sshd \
-		--with-md5-passwords \
-		$(use_with ldap) \
-		$(use_with libedit) \
-		$(use_with kerberos kerberos5 /usr) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_with selinux) \
-		$(use_with skey) \
-		$(use_with smartcard opensc) \
-		${myconf} \
-		|| die "bad configure"
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install-nokeys DESTDIR="${D}" || die
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-	keepdir /var/empty
-
-	newpamd "${FILESDIR}"/sshd.pam_include sshd
-	dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
-	use pam \
-		&& dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
-		&& dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
-
-	doman contrib/ssh-copy-id.1
-	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-}
-
-pkg_postinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-
-	ewarn "Remember to merge your config files in /etc/ssh/ and then"
-	ewarn "restart sshd: '/etc/init.d/sshd restart'."
-	ewarn
-	einfo "As of version 3.4 the default is to enable the UsePrivelegeSeparation"
-	einfo "functionality, but please ensure that you do not explicitly disable"
-	einfo "this in your configuration as disabling it opens security holes"
-	einfo
-	einfo "This revision has removed your sshd user id and replaced it with a"
-	einfo "new one with UID 22.  If you have any scripts or programs that"
-	einfo "that referenced the old UID directly, you will need to update them."
-	einfo
-	if use pam ; then
-		einfo "Please be aware users need a valid shell in /etc/passwd"
-		einfo "in order to be allowed to login."
-		einfo
-	fi
-}
diff --git a/net-misc/openssh/openssh-4.3_p2-r3.ebuild b/net-misc/openssh/openssh-4.3_p2-r3.ebuild
deleted file mode 100644
index 82b119422ed7..000000000000
--- a/net-misc/openssh/openssh-4.3_p2-r3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r3.ebuild,v 1.7 2006/09/22 22:11:20 dertobi123 Exp $
-
-inherit eutils flag-o-matic ccc pam multilib
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-X509_PATCH="${PARCH}+x509-5.5.diff.gz"
-SECURID_PATCH="${PARCH}+SecurID_v1.3.2.patch"
-LDAP_PATCH="${PARCH/-4.3p2/-lpk-4.3p1}-0.3.7.patch"
-HPN_PATCH="${PARCH}-hpn12-gentoo.patch.bz2"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	hpn? ( mirror://gentoo/${HPN_PATCH} http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
-	X509? ( http://roumenpetrov.info/openssh/x509-5.5/${X509_PATCH} )
-	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
-	ldap? ( http://www.opendarwin.org/projects/openssh-lpk/files/${LDAP_PATCH} )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard sftplogging hpn libedit X"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	skey? ( >=app-admin/skey-1.1.5-r1 )
-	ldap? ( net-nds/openldap )
-	libedit? ( || ( dev-libs/libedit sys-freebsd/freebsd-lib ) )
-	>=dev-libs/openssl-0.9.6d
-	>=sys-libs/zlib-1.2.3
-	smartcard? ( dev-libs/opensc )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	X? ( || ( x11-apps/xauth virtual/x11 ) )
-	userland_GNU? ( sys-apps/shadow )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-
-PROVIDE="virtual/ssh"
-
-S=${WORKDIR}/${PARCH}
-
-src_unpack() {
-	unpack ${PARCH}.tar.gz
-	cd "${S}"
-
-	sed -i \
-		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
-		pathnames.h || die
-
-	epatch "${FILESDIR}"/openssh-4.3_p2-identical-simple-dos.patch #148228
-	epatch "${FILESDIR}"/openssh-4.3_p2-configure.patch #137921
-	epatch "${FILESDIR}"/openssh-4.3_p1-krb5-typos.patch #124494
-	use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-x509-hpn-glue.patch
-	use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
-	use chroot && epatch "${FILESDIR}"/openssh-4.3_p1-chroot.patch
-	if use X509 ; then
-		cp "${FILESDIR}"/openssh-4.3_p2-selinux.patch .
-		epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch.glue ./openssh-4.3_p2-selinux.patch
-	else
-		epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch
-	fi
-	use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
-	if ! use X509 ; then
-		if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then
-			epatch "${DISTDIR}"/${SECURID_PATCH} "${FILESDIR}"/${P}-securid-hpn-glue.patch
-			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
-		fi
-		if use ldap ; then
-			use sftplogging \
-				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
-				|| epatch "${DISTDIR}"/${LDAP_PATCH}
-		fi
-	elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
-		ewarn "Sorry, x509 and smartcard/ldap don't get along"
-	fi
-	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
-
-	sed -i '/LD.*ssh-keysign/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid"
-
-	sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
-
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys #skey configure code triggers this
-
-	local myconf=""
-	if use static ; then
-		append-ldflags -static
-		use pam && ewarn "Disabling pam support becuse of static flag"
-		myconf="${myconf} --without-pam"
-	else
-		myconf="${myconf} $(use_with pam)"
-	fi
-
-	use ipv6 || myconf="${myconf} --with-ipv4-default"
-
-	econf \
-		--with-ldflags="${LDFLAGS}" \
-		--disable-strip \
-		--sysconfdir=/etc/ssh \
-		--libexecdir=/usr/$(get_libdir)/misc \
-		--datadir=/usr/share/openssh \
-		--disable-suid-ssh \
-		--with-privsep-path=/var/empty \
-		--with-privsep-user=sshd \
-		--with-md5-passwords \
-		$(use_with ldap) \
-		$(use_with libedit) \
-		$(use_with kerberos kerberos5 /usr) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_with selinux) \
-		$(use_with skey) \
-		$(use_with smartcard opensc) \
-		${myconf} \
-		|| die "bad configure"
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install-nokeys DESTDIR="${D}" || die
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-	keepdir /var/empty
-
-	newpamd "${FILESDIR}"/sshd.pam_include sshd
-	dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
-	use pam \
-		&& dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
-		&& dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
-
-	doman contrib/ssh-copy-id.1
-	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-}
-
-pkg_postinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-
-	ewarn "Remember to merge your config files in /etc/ssh/ and then"
-	ewarn "restart sshd: '/etc/init.d/sshd restart'."
-	ewarn
-	einfo "As of version 3.4 the default is to enable the UsePrivelegeSeparation"
-	einfo "functionality, but please ensure that you do not explicitly disable"
-	einfo "this in your configuration as disabling it opens security holes"
-	einfo
-	einfo "This revision has removed your sshd user id and replaced it with a"
-	einfo "new one with UID 22.  If you have any scripts or programs that"
-	einfo "that referenced the old UID directly, you will need to update them."
-	einfo
-	if use pam ; then
-		einfo "Please be aware users need a valid shell in /etc/passwd"
-		einfo "in order to be allowed to login."
-		einfo
-	fi
-}
diff --git a/net-misc/openssh/openssh-4.3_p2-r4.ebuild b/net-misc/openssh/openssh-4.3_p2-r4.ebuild
deleted file mode 100644
index 8922f6683d75..000000000000
--- a/net-misc/openssh/openssh-4.3_p2-r4.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r4.ebuild,v 1.4 2006/09/24 03:38:40 vapier Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit eutils flag-o-matic ccc pam multilib autotools
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-X509_PATCH="${PARCH}+x509-5.5.diff.gz"
-SECURID_PATCH="${PARCH}+SecurID_v1.3.2.patch"
-LDAP_PATCH="${PARCH/-4.3p2/-lpk-4.3p1}-0.3.7.patch"
-HPN_PATCH="${PARCH}-hpn12-gentoo.patch.bz2"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	hpn? ( mirror://gentoo/${HPN_PATCH} http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )
-	X509? ( http://roumenpetrov.info/openssh/x509-5.5/${X509_PATCH} )
-	smartcard? ( http://www.omniti.com/~jesus/projects/${SECURID_PATCH} )
-	ldap? ( http://www.opendarwin.org/projects/openssh-lpk/files/${LDAP_PATCH} )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="ipv6 static pam tcpd kerberos skey selinux chroot X509 ldap smartcard sftplogging hpn libedit X"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	skey? ( >=app-admin/skey-1.1.5-r1 )
-	ldap? ( net-nds/openldap )
-	libedit? ( || ( dev-libs/libedit sys-freebsd/freebsd-lib ) )
-	>=dev-libs/openssl-0.9.6d
-	>=sys-libs/zlib-1.2.3
-	smartcard? ( dev-libs/opensc )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	X? ( || ( x11-apps/xauth virtual/x11 ) )
-	userland_GNU? ( sys-apps/shadow )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-
-PROVIDE="virtual/ssh"
-
-S=${WORKDIR}/${PARCH}
-
-src_unpack() {
-	unpack ${PARCH}.tar.gz
-	cd "${S}"
-
-	sed -i \
-		-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
-		pathnames.h || die
-
-	epatch "${FILESDIR}"/openssh-4.3_p2-identical-simple-dos.patch #148228
-	epatch "${FILESDIR}"/openssh-4.3_p2-configure.patch #137921
-	epatch "${FILESDIR}"/openssh-4.3_p1-krb5-typos.patch #124494
-	epatch "${FILESDIR}"/openssh-4.3_p2-opensc-libs.patch #148538
-	use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-x509-hpn-glue.patch
-	use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
-	use chroot && epatch "${FILESDIR}"/openssh-4.3_p1-chroot.patch
-	if use X509 ; then
-		cp "${FILESDIR}"/openssh-4.3_p2-selinux.patch .
-		epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch.glue ./openssh-4.3_p2-selinux.patch
-	else
-		epatch "${FILESDIR}"/openssh-4.3_p2-selinux.patch
-	fi
-	use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
-	if ! use X509 ; then
-		if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then
-			epatch \
-				"${DISTDIR}"/${SECURID_PATCH} \
-				"${FILESDIR}"/${P}-securid-updates.patch \
-				"${FILESDIR}"/${P}-securid-hpn-glue.patch
-			use ldap && epatch "${FILESDIR}"/openssh-4.0_p1-smartcard-ldap-happy.patch
-		fi
-		if use ldap ; then
-			use sftplogging \
-				&& ewarn "Sorry, sftplogging and ldap don't get along, disabling ldap" \
-				|| epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${P}-ldap-updates.patch
-		fi
-	elif [[ -n ${SECURID_PATCH} ]] && use smartcard || use ldap ; then
-		ewarn "Sorry, x509 and smartcard/ldap don't get along, disabling smartcard/ldap"
-	fi
-	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
-
-	sed -i '/LD.*ssh-keysign/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid"
-
-	sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
-
-	eautoreconf
-}
-
-src_compile() {
-	addwrite /dev/ptmx
-	addpredict /etc/skey/skeykeys #skey configure code triggers this
-
-	local myconf=""
-	if use static ; then
-		append-ldflags -static
-		use pam && ewarn "Disabling pam support becuse of static flag"
-		myconf="${myconf} --without-pam"
-	else
-		myconf="${myconf} $(use_with pam)"
-	fi
-
-	use ipv6 || myconf="${myconf} --with-ipv4-default"
-
-	econf \
-		--with-ldflags="${LDFLAGS}" \
-		--disable-strip \
-		--sysconfdir=/etc/ssh \
-		--libexecdir=/usr/$(get_libdir)/misc \
-		--datadir=/usr/share/openssh \
-		--disable-suid-ssh \
-		--with-privsep-path=/var/empty \
-		--with-privsep-user=sshd \
-		--with-md5-passwords \
-		$(use_with ldap) \
-		$(use_with libedit) \
-		$(use_with kerberos kerberos5 /usr) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_with selinux) \
-		$(use_with skey) \
-		$(use_with smartcard opensc) \
-		${myconf} \
-		|| die "bad configure"
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install-nokeys DESTDIR="${D}" || die
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-	keepdir /var/empty
-
-	newpamd "${FILESDIR}"/sshd.pam_include sshd
-	dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config
-	use pam \
-		&& dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
-		&& dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
-
-	doman contrib/ssh-copy-id.1
-	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-}
-
-pkg_postinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-
-	ewarn "Remember to merge your config files in /etc/ssh/ and then"
-	ewarn "restart sshd: '/etc/init.d/sshd restart'."
-	ewarn
-	einfo "As of version 3.4 the default is to enable the UsePrivelegeSeparation"
-	einfo "functionality, but please ensure that you do not explicitly disable"
-	einfo "this in your configuration as disabling it opens security holes"
-	einfo
-	einfo "This revision has removed your sshd user id and replaced it with a"
-	einfo "new one with UID 22.  If you have any scripts or programs that"
-	einfo "that referenced the old UID directly, you will need to update them."
-	einfo
-	if use pam ; then
-		einfo "Please be aware users need a valid shell in /etc/passwd"
-		einfo "in order to be allowed to login."
-		einfo
-	fi
-}