Remove obsolete versions.

Correct doc install path (#241976).
Version bump.
Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

15 files changed, 82 insertions, 914 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index def8d44653e8..844b9000d087 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.54 2008/10/12 16:39:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.55 2008/12/03 23:30:28 mrness Exp $
+
+*openswan-2.6.19 (03 Dec 2008)
+*openswan-2.4.13-r2 (03 Dec 2008)
+
+  03 Dec 2008; Alin Năstac <mrness@gentoo.org>
+  -files/openswan-2.4.11-gentoo.patch,
+  -files/openswan-2.4.11-implicit-decl.patch,
+  -files/openswan-2.4.12-deprecated-ldap.patch,
+  -files/openswan-2.4.12-gentoo.patch, -files/openswan-2.6.16-gentoo.patch,
+  -files/openswan-2.6.16-qa-fixes.patch,
+  -files/openswan-2.6.16-refine-connection.patch,
+  +files/openswan-2.6.19-gentoo.patch,
+  +files/openswan-2.6.19-qa-fixes.patch, -openswan-2.4.11.ebuild,
+  -openswan-2.4.12.ebuild, -openswan-2.4.13-r1.ebuild,
+  +openswan-2.4.13-r2.ebuild, -openswan-2.6.16.ebuild,
+  openswan-2.6.18.ebuild, +openswan-2.6.19.ebuild:
+  Remove obsolete versions. Correct doc install path (#241976). Version bump.
 
 *openswan-2.6.18 (12 Oct 2008)
 *openswan-2.4.13-r1 (12 Oct 2008)
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index f0d4e8d4e781..94050748d750 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -3,32 +3,23 @@ Hash: SHA1
 
 AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a613a025d34ea3b68e95c2b13e62c SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21
 AUX ipsec-initd 487 RMD160 23d9d7be6000fb95fdb142bc948964d6050b7864 SHA1 55a4c3ab2523f265e314c9048c0552699564fc4d SHA256 e86140b6e596a0b0d6e52ca521adb891eb3b9cc4ad8e6f28041fb773f9f60347
-AUX openswan-2.4.11-gentoo.patch 16263 RMD160 39f72ab5edcc29a46de25398414f434814465fad SHA1 ce0e922722921315eb97acf650a5101b010e0e63 SHA256 1fa4f4323c40ca2d7f61abead7dd4c08ce2df9ed644df277c7b700825f7d9ec5
-AUX openswan-2.4.11-implicit-decl.patch 372 RMD160 b9f1ac0ba583d18ca029f4d990d8c2c697ede6c6 SHA1 c1864d0f9cc7d865fcc0df9c270962f4904724c6 SHA256 398ce3760280ec1db3c14a3e073d4a428453c44aaf2bd8de9567ad9ecaf3dc92
-AUX openswan-2.4.12-deprecated-ldap.patch 372 RMD160 3e39f78960828f8552c0e0d9a561a10846bb9f74 SHA1 e2171af09ccdedac0a4839f51bd0ab8215c9158c SHA256 c895706d3dd7f7bf679457c9769d3ca95f62b47a7a42ea943204e3a3db5864cd
-AUX openswan-2.4.12-gentoo.patch 5966 RMD160 0a64f2bccbf4d89cb96f1a1b39b23810a83d71d6 SHA1 24328b8815c524e049edd163f700f7a6b4bc315e SHA256 ab212078ffc1d6060fd51554a74ef6e9cac6b7f5f8f3e09710f7780364b588f6
 AUX openswan-2.4.13-deprecated-ldap.patch 371 RMD160 4fb852b20240b9c2b22db5d2ca5b75ac7c4ca2f0 SHA1 8d70c48e525467e26cdf5f1f6fb36d49a03d8a20 SHA256 9d406ba127eca56ba5e64517fe107e1785c07cad9e7a770d8481d7998c4e1709
 AUX openswan-2.4.13-gentoo-fixed.patch 6724 RMD160 5714afc4819bf8be7929601d8702e8d7099e81ad SHA1 6ff4183bda05b3cd2e94b8ca9214cfa3be9ea130 SHA256 866ec2c50c050c34425d12f7f12d12b9fe9ccdd1f5ca8ce6a0a76bec0002bf58
-AUX openswan-2.6.16-gentoo.patch 2515 RMD160 b4a22ba60677ac9de7242b354d7400e5e208eee7 SHA1 c942a424355f7ee4e4128660769752ced5babf48 SHA256 8ba1d7b22c71fd7354423380d0576cf7bc12a6077d99de756ea8e95c607c1f5a
-AUX openswan-2.6.16-qa-fixes.patch 1557 RMD160 ba951202ff775e7be309dd2b45b2f541e35fa815 SHA1 0e942b91e62dd1eaf3fa1c84d1e304c4e4040629 SHA256 9b0ee1de39f7c62d2b81d1017561e0386b2bcc3860307fef0f2bbc461064f1f1
-AUX openswan-2.6.16-refine-connection.patch 1183 RMD160 930d7c2402b450bdbc08a9844f71197c2be54a61 SHA1 e32f0ccb56e54047c818d7f6e432120ba9871b51 SHA256 b2f28016457d1e4d7994d2bb2030eff0b987bd75d4368de8338d593efed90d94
 AUX openswan-2.6.18-gentoo.patch 3954 RMD160 6f6679c8936e39feaaba86e51b7f13a58eee2678 SHA1 97b80a3074b06fabeb6bd2bd373eeb71b33ce692 SHA256 58e9fb7ce5dbf63b00bb4a91d7bb6bb0c23be8695df625289eeb52b9c85b1c3b
-DIST openswan-2.4.11.tar.gz 3759918 RMD160 c77777aaeba65e92196aad9e7c32ffd7c2e4a49d SHA1 532bf898872ced97888be95adc5814b6155a9574 SHA256 4adea45d7cc413b558f15e4528de4486b62a07cfd2af2bf592b09cea3f16ecae
-DIST openswan-2.4.12.tar.gz 3764063 RMD160 09f4454399651d369961aa678205b90e13a124c0 SHA1 225ab28ca970a062160b026570597588883b71d8 SHA256 4024e9a6b6e7171fb195a4228043142dd5e92035325b6cd18deb338f77ca494b
-DIST openswan-2.4.13.tar.gz 3761840 RMD160 cc22c2d838d33fe2a08173aa1602ec39cfde3a80 SHA1 ad314d22f08c8de08624b1a7f69120eae23fad4b SHA256 1dcf1ebcc8b974def51b09e791de267ec9813b6af086337aa06909e27ccff5f6
-DIST openswan-2.6.16.tar.gz 6134304 RMD160 bb0b713dba75ecdfb7be6cef6521bde625fc91b6 SHA1 922d57ad4fc8f19f8fc31fb219076772099c86dd SHA256 bfa4b5a806669fc2eda76c86b659fdfc740b2e5e5e810f28829f63c5824dc2e3
+AUX openswan-2.6.19-gentoo.patch 3504 RMD160 ec4f52e66352f59115c34b3bb13ed8f5008a0c81 SHA1 646e758162cfd837281ba8a1a6c36161f9b5c3f2 SHA256 70da348923ac51cb5e637dcabfa5795ce85a4ad92b9f0e3dcdbcb7df573deed3
+AUX openswan-2.6.19-qa-fixes.patch 408 RMD160 89bbae8456a33fb7297c9d242f24ca13de1512f9 SHA1 d6d215e5429a0ded2b0aee49e4ea2e2b6846fdcc SHA256 bad4f78c2c55e3cb815d0fd241e59adf9725875b0ed989722e2756af0155e8c9
+DIST openswan-2.4.13.tar.gz 783776 RMD160 5f40376f03555ff51d7163bdf139c9d5b1f997c8 SHA1 da63ef7c78dbb1a7fe11db6c89c52a1dc6780505 SHA256 eb2fd30ffce1b212c4985da296ffb1744b8cbbd1971453a2d784b1a80e95767b
 DIST openswan-2.6.18.tar.gz 6500877 RMD160 c13ce14caa723f562754b078b1728178a314dfd8 SHA1 18917fa265b61834d181ca3b7e6477b0a8083b3c SHA256 0b7311bb11bc609dc5fd2eb52eb1c3dc4421034d6f877cc1e8f97a2cfb18b704
-EBUILD openswan-2.4.11.ebuild 3755 RMD160 f132d77d7879c2e63a2b29aebb4a1ffe9ab7381e SHA1 70ab5a61c5b556dc1b97796d2a142e72d56d7c28 SHA256 c425cc7a7133b9286e7cd4a43de218ababc4f5a1433dda49e2b57e75388a6105
-EBUILD openswan-2.4.12.ebuild 3540 RMD160 b90a1cb2a06baf62f0ca364b88d1e0e9c7c6d80b SHA1 9d5b08a4e0ed61295daab21f6534d98f00d7830d SHA256 02d65ea25fbaedb9a0ce2d2a548bd00b541a2064ab281301028d303534f034d5
-EBUILD openswan-2.4.13-r1.ebuild 3537 RMD160 cb3d93e4a88067a236e056db382f1a8440b3a782 SHA1 f6f86777cb6daae949fd35b11446f90bb7762596 SHA256 d71dfe93b8b7d467dbd6ebef54037175e4db9610e8e63852623658305154d525
-EBUILD openswan-2.6.16.ebuild 4575 RMD160 697d42205aaa432b35c2c867436b62db101f57a3 SHA1 29f95f09ea37bdf49d93588b7a140f4a8702a9be SHA256 7bc7d128c90b03b9726a4f9ddb3abb8a7e4548b996719eac3139e05ed56e7139
-EBUILD openswan-2.6.18.ebuild 4482 RMD160 66ef4b2b90c555e1fe09f2e06845762d9cddd98c SHA1 eba6f9542ced9168f4d9792f655dad47cabf0f0f SHA256 5d42fe307814476403b71d1b6854e6e762da6b6b2e695d6ae9099a6f62bbf9b2
-MISC ChangeLog 9758 RMD160 9e926cef7457f81037b8b9121e8bb6f7e516f770 SHA1 2beafcb816687bcdfc7e7cec60c1f8519644da8f SHA256 7dbeda64f67492c2df644a5608d518d9d4445d036ef4a3058c0254b2aee70f00
+DIST openswan-2.6.19.tar.gz 6547468 RMD160 844d4f0eaf8a3165c4a1195fb7f874f384c46424 SHA1 532df8f907d89637a83b8bc1cb5032f929209ed0 SHA256 44547bde3cb603e31b7aa251bcbfb02c1fecbaa73acada6f95f38f99e7b7d7a2
+EBUILD openswan-2.4.13-r2.ebuild 3539 RMD160 da78299a3284f09f52b12dabab71d1b562062caf SHA1 6ac95439aca2c0043a9ede05d4d8ed6a7052602c SHA256 e4df8b3da5a63524f5d8ff92057e1fbbcec7e3f8e93c4853f81ceacfa22f6c4c
+EBUILD openswan-2.6.18.ebuild 4489 RMD160 e3afc104f85273eae57373e7d45cb3b2d9a1c704 SHA1 9e68707820d4bad9a77a0ea64f2a1e50fb27a85e SHA256 f48bf1fdad795b5d9cc56c6f3e2f993dbcc031d2f060caa4ecd68d7f373d1ff2
+EBUILD openswan-2.6.19.ebuild 4531 RMD160 33a9dcf4a40050486503e3da13e6dcee3e26e2b2 SHA1 b5f2085f3fb0325d508790d7ebe8678fb0b43ed8 SHA256 e3c50203d6d08335d1d24f17b3f1e36877128aa539bf868471dc8ce4c2f393d3
+MISC ChangeLog 10517 RMD160 e6a8883136306b41b69ee39fb692ae8c74f7b9e0 SHA1 0995f1a23fa7ace28d24b77518919042879d75dc SHA256 43e4c4d09f27f8d07d1d3fbb6cca14f32a4d29e29ac6b726d62eba21d3b26052
 MISC metadata.xml 1084 RMD160 7cf6387beefc2f3837b1a89b1998455b2d4719c0 SHA1 a3fdcf876700e8497a5a326cf3c0d8bb94601e9d SHA256 a16ca55eac2181ef69fce35e53a92cded04dc188f52a60410b670d8c2d50284e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjyKEMACgkQPrHvTlXvhtudcQCdFmHioPqp/T6HOKnH5ykgALBb
-rd8An2VQb2YGtbUqnA1hoCadpvCv/TKd
-=G5B9
+iEYEARECAAYFAkk3FqQACgkQPrHvTlXvhtuRfgCeMUA88VYdDFn7NxMgZxUroB9U
+10gAnA7NT6PaMs3R2PzgFZHea/Xfw98S
+=WrHc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.4.11-gentoo.patch b/net-misc/openswan/files/openswan-2.4.11-gentoo.patch
deleted file mode 100644
index c145c7e95c29..000000000000
--- a/net-misc/openswan/files/openswan-2.4.11-gentoo.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-diff -Nru openswan-2.4.11.orig/doc/Makefile openswan-2.4.11/doc/Makefile
---- openswan-2.4.11.orig/doc/Makefile	2005-11-08 23:32:45.000000000 +0200
-+++ openswan-2.4.11/doc/Makefile	2008-01-29 14:03:15.000000000 +0200
-@@ -1,6 +1,6 @@
- # Makefile to generate various formats from HTML source
- #
--# Assumes the htmldoc utility is available.
-+# No longer cares if the htmldoc utility is available.
- # This can be downloaded from www.easysw.com
- #
- # Also needs lynx(1) for HTML-to-text conversion
-diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.11/lib/libcrypto/libdes/asm/crypt586.pl
---- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/crypt586.pl	2004-07-16 03:24:45.000000000 +0300
-+++ openswan-2.4.11/lib/libcrypto/libdes/asm/crypt586.pl	2008-01-29 14:03:15.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
-diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/cbc.pl
---- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2004-07-10 11:07:06.000000000 +0300
-+++ openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2008-01-29 14:03:15.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
- # des_cblock (*input);
-diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
---- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2004-07-10 11:07:06.000000000 +0300
-+++ openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2008-01-29 14:03:15.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
-diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
---- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2004-07-10 11:07:07.000000000 +0300
-+++ openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2008-01-29 14:03:15.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
---- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2004-07-10 11:07:07.000000000 +0300
-+++ openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2008-01-29 14:03:15.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Nru openswan-2.4.11.orig/lib/liblwres/Makefile openswan-2.4.11/lib/liblwres/Makefile
---- openswan-2.4.11.orig/lib/liblwres/Makefile	2007-10-22 17:33:11.000000000 +0300
-+++ openswan-2.4.11/lib/liblwres/Makefile	2008-01-29 14:04:47.000000000 +0200
-@@ -20,7 +20,7 @@
- CDEFINES = -g
- CWARNINGS = -Werror
- 
--CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
-+CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE)
- 
- VERSION="@(\#) openswan-hacking-9.3-for-osw2"
- LIBINTERFACE=2
-diff -Nru openswan-2.4.11.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.11/linux/net/ipsec/des/asm/des-586.pl
---- openswan-2.4.11.orig/linux/net/ipsec/des/asm/des-586.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.11/linux/net/ipsec/des/asm/des-586.pl	2008-01-29 14:03:15.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
-diff -Nru openswan-2.4.11.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.11/linux/net/ipsec/des/asm/des686.pl
---- openswan-2.4.11.orig/linux/net/ipsec/des/asm/des686.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.11/linux/net/ipsec/des/asm/des686.pl	2008-01-29 14:03:15.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Nru openswan-2.4.11.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.11/linux/net/ipsec/des/asm/desboth.pl
---- openswan-2.4.11.orig/linux/net/ipsec/des/asm/desboth.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.11/linux/net/ipsec/des/asm/desboth.pl	2008-01-29 14:03:15.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Nru openswan-2.4.11.orig/Makefile.inc openswan-2.4.11/Makefile.inc
---- openswan-2.4.11.orig/Makefile.inc	2007-12-04 19:56:45.000000000 +0200
-+++ openswan-2.4.11/Makefile.inc	2008-01-29 14:03:15.000000000 +0200
-@@ -46,7 +46,7 @@
- DESTDIR?=
- 
- # "local" part of tree, used in building other pathnames
--INC_USRLOCAL=/usr/local
-+INC_USRLOCAL?=/usr
- 
- # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
- # settings which are assumed to include it (or at least, to include *some*
-@@ -80,7 +80,7 @@
- MANPLACES=man3 man5 man8
- 
- # where configuration files go
--FINALCONFFILE?=/etc/ipsec.conf
-+FINALCONFFILE?=/etc/ipsec/ipsec.conf
- CONFFILE=$(DESTDIR)$(FINALCONFFILE)
- 
- FINALCONFDIR?=/etc
-@@ -91,7 +91,7 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
- FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-@@ -241,7 +241,7 @@
- # installed one in RH 7.2, won't work - you wind up depending upon
- # openssl.
- 
--BIND9STATICLIBDIR?=/usr/local/lib
-+BIND9STATICLIBDIR?=/usr/lib
- 
- # if you install elsewere, you may need to point the include files to it.
- #BIND9STATICLIBDIR?=/sandel/lib
-diff -Nru openswan-2.4.11.orig/programs/barf/barf.in openswan-2.4.11/programs/barf/barf.in
---- openswan-2.4.11.orig/programs/barf/barf.in	2006-11-07 05:49:18.000000000 +0200
-+++ openswan-2.4.11/programs/barf/barf.in	2008-01-29 14:03:15.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- LOGS=${LOGS-/var/log}
- CONFS=${IPSEC_CONFS-/etc}
--CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
-+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
- me="ipsec barf"
- # Max lines to use for things like 'route -n'
- maxlines=100
-@@ -238,13 +238,13 @@
- 	done
- fi
- _________________________ ipsec/ls-libdir
--ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
-+ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
- _________________________ ipsec/ls-execdir
--ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
-+ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
- _________________________ ipsec/updowns
--for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
-+for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
- do
--	cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
-+	cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
- done
- _________________________ /proc/net/dev
- cat /proc/net/dev
-diff -Nru openswan-2.4.11.orig/programs/eroute/eroute.5 openswan-2.4.11/programs/eroute/eroute.5
---- openswan-2.4.11.orig/programs/eroute/eroute.5	2006-10-26 23:40:43.000000000 +0300
-+++ openswan-2.4.11/programs/eroute/eroute.5	2008-01-29 14:03:15.000000000 +0200
-@@ -168,7 +168,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_eroute, /usr/local/bin/ipsec
-+/proc/net/ipsec_eroute, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.11.orig/programs/eroute/eroute.8 openswan-2.4.11/programs/eroute/eroute.8
---- openswan-2.4.11.orig/programs/eroute/eroute.8	2003-10-31 04:32:27.000000000 +0200
-+++ openswan-2.4.11/programs/eroute/eroute.8	2008-01-29 14:03:15.000000000 +0200
-@@ -308,7 +308,7 @@
- .br
- .LP
- .SH FILES
--/proc/net/ipsec_eroute, /usr/local/bin/ipsec
-+/proc/net/ipsec_eroute, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
- ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
-diff -Nru openswan-2.4.11.orig/programs/_include/_include.in openswan-2.4.11/programs/_include/_include.in
---- openswan-2.4.11.orig/programs/_include/_include.in	2003-01-06 23:44:04.000000000 +0200
-+++ openswan-2.4.11/programs/_include/_include.in	2008-01-29 14:03:15.000000000 +0200
-@@ -47,10 +47,10 @@
- do
- 	if test ! -r "$f"
- 	then
--		if test ! "$f" = "/etc/ipsec.conf"
-+		if test ! "$f" = "/etc/ipsec/ipsec.conf"
- 		then
- 			echo "#:cannot open configuration file \'$f\'"
--			if test "$f" = "/etc/ipsec.secrets"
-+			if test "$f" = "/etc/ipsec/ipsec.secrets"
- 			then
- 				echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
- 			fi
-diff -Nru openswan-2.4.11.orig/programs/ipsec/ipsec.8 openswan-2.4.11/programs/ipsec/ipsec.8
---- openswan-2.4.11.orig/programs/ipsec/ipsec.8	2003-02-27 18:51:54.000000000 +0200
-+++ openswan-2.4.11/programs/ipsec/ipsec.8	2008-01-29 14:03:15.000000000 +0200
-@@ -81,7 +81,7 @@
- .I ipsec
- thinks the IPsec configuration files are stored.
- .SH FILES
--/usr/local/lib/ipsec	usual utilities directory
-+/usr/lib/ipsec	usual utilities directory
- .SH ENVIRONMENT
- .PP
- The following environment variables control where FreeS/WAN finds its
-diff -Nru openswan-2.4.11.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.11/programs/klipsdebug/klipsdebug.5
---- openswan-2.4.11.orig/programs/klipsdebug/klipsdebug.5	2006-10-27 01:21:25.000000000 +0300
-+++ openswan-2.4.11/programs/klipsdebug/klipsdebug.5	2008-01-29 14:03:15.000000000 +0200
-@@ -114,7 +114,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
-+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.11.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.11/programs/klipsdebug/klipsdebug.8
---- openswan-2.4.11.orig/programs/klipsdebug/klipsdebug.8	2006-10-27 01:21:25.000000000 +0300
-+++ openswan-2.4.11/programs/klipsdebug/klipsdebug.8	2008-01-29 14:03:15.000000000 +0200
-@@ -111,7 +111,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
-+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.11.orig/programs/mailkey/mailkey.in openswan-2.4.11/programs/mailkey/mailkey.in
---- openswan-2.4.11.orig/programs/mailkey/mailkey.in	2006-10-29 02:49:23.000000000 +0300
-+++ openswan-2.4.11/programs/mailkey/mailkey.in	2008-01-29 14:03:15.000000000 +0200
-@@ -60,7 +60,7 @@
- 
- "$test1st"
- 
--Common concerns: This account must be able to read /etc/ipsec.secrets. 
-+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. 
- If you haven't generated your key yet, please run 'ipsec newhostkey'." 
- exit 0
- }
-diff -Nru openswan-2.4.11.orig/programs/pluto/Makefile openswan-2.4.11/programs/pluto/Makefile
---- openswan-2.4.11.orig/programs/pluto/Makefile	2007-11-06 20:56:26.000000000 +0200
-+++ openswan-2.4.11/programs/pluto/Makefile	2008-01-29 14:03:15.000000000 +0200
-@@ -210,7 +210,7 @@
- endif
- 
- ifeq ($(USE_WEAKSTUFF),true)
--WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 #-DUSE_1DES
-+WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 -DUSE_1DES
- endif
- 
- ifeq ($(USE_EXTRACRYPTO),true)
-@@ -256,7 +256,7 @@
- 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
- 	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
- 
--ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
-+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
- 
- # libefence is a free memory allocation debugger
- # Solaris 2 needs -lsocket -lnsl
-diff -Nru openswan-2.4.11.orig/programs/setup/Makefile openswan-2.4.11/programs/setup/Makefile
---- openswan-2.4.11.orig/programs/setup/Makefile	2004-12-18 20:13:43.000000000 +0200
-+++ openswan-2.4.11/programs/setup/Makefile	2008-01-29 14:03:15.000000000 +0200
-@@ -33,25 +33,10 @@
- 	@rm -f $(BINDIR)/setup
- 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- 	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
--	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
--	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
--	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K76ipsec
--	@echo $(RCDIR)/../rc1.d/K76ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K76ipsec
- 
- clean::
- 	@rm -f setup
-diff -Nru openswan-2.4.11.orig/programs/showhostkey/showhostkey.in openswan-2.4.11/programs/showhostkey/showhostkey.in
---- openswan-2.4.11.orig/programs/showhostkey/showhostkey.in	2007-06-19 18:27:27.000000000 +0300
-+++ openswan-2.4.11/programs/showhostkey/showhostkey.in	2008-01-29 14:03:15.000000000 +0200
-@@ -18,7 +18,7 @@
- usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
-                   [--dhclient] [--ipseckey]"
- 
--file=/etc/ipsec.secrets
-+file=/etc/ipsec/ipsec.secrets
- fmt=""
- gw=
- id=
-diff -Nru openswan-2.4.11.orig/programs/showpolicy/showpolicy.8 openswan-2.4.11/programs/showpolicy/showpolicy.8
---- openswan-2.4.11.orig/programs/showpolicy/showpolicy.8	2005-01-11 19:52:50.000000000 +0200
-+++ openswan-2.4.11/programs/showpolicy/showpolicy.8	2008-01-29 14:03:15.000000000 +0200
-@@ -19,7 +19,7 @@
- .PP
- This is a test program. One might run it from inetd, via:
- .TP
--discard stream tcp nowait nobody /usr/local/libexec/ipsec/showpolicy showpolicy
-+discard stream tcp nowait nobody /usr/libexec/ipsec/showpolicy showpolicy
- .SH FILES
- /var/run/pluto/ipsecpolicy.ctl
- .SH "SEE ALSO"
-diff -Nru openswan-2.4.11.orig/programs/spi/spi.5 openswan-2.4.11/programs/spi/spi.5
---- openswan-2.4.11.orig/programs/spi/spi.5	2006-10-26 23:53:59.000000000 +0300
-+++ openswan-2.4.11/programs/spi/spi.5	2008-01-29 14:03:15.000000000 +0200
-@@ -157,7 +157,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_spi, /usr/local/bin/ipsec
-+/proc/net/ipsec_spi, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.11.orig/programs/spi/spi.8 openswan-2.4.11/programs/spi/spi.8
---- openswan-2.4.11.orig/programs/spi/spi.8	2006-10-30 22:00:04.000000000 +0200
-+++ openswan-2.4.11/programs/spi/spi.8	2008-01-29 14:03:15.000000000 +0200
-@@ -215,7 +215,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_spi, /usr/local/bin/ipsec
-+/proc/net/ipsec_spi, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.11.orig/programs/spigrp/spigrp.5 openswan-2.4.11/programs/spigrp/spigrp.5
---- openswan-2.4.11.orig/programs/spigrp/spigrp.5	2006-10-26 23:50:29.000000000 +0300
-+++ openswan-2.4.11/programs/spigrp/spigrp.5	2008-01-29 14:03:15.000000000 +0200
-@@ -67,7 +67,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
-+/proc/net/ipsec_spigrp, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.11.orig/programs/spigrp/spigrp.8 openswan-2.4.11/programs/spigrp/spigrp.8
---- openswan-2.4.11.orig/programs/spigrp/spigrp.8	2006-10-26 23:50:29.000000000 +0300
-+++ openswan-2.4.11/programs/spigrp/spigrp.8	2008-01-29 14:03:15.000000000 +0200
-@@ -87,7 +87,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
-+/proc/net/ipsec_spigrp, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.11.orig/programs/tncfg/tncfg.5 openswan-2.4.11/programs/tncfg/tncfg.5
---- openswan-2.4.11.orig/programs/tncfg/tncfg.5	2006-11-24 06:34:10.000000000 +0200
-+++ openswan-2.4.11/programs/tncfg/tncfg.5	2008-01-29 14:03:15.000000000 +0200
-@@ -82,7 +82,7 @@
- is not connected to any physical device.
- .SH "FILES"
- .PP
--/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
-+/proc/net/ipsec_tncfg, /usr/bin/ipsec
- .SH "SEE ALSO"
- .PP
- ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5), ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5), ipsec_pf_key(5)
-diff -Nru openswan-2.4.11.orig/programs/tncfg/tncfg.8 openswan-2.4.11/programs/tncfg/tncfg.8
---- openswan-2.4.11.orig/programs/tncfg/tncfg.8	2006-11-24 06:34:10.000000000 +0200
-+++ openswan-2.4.11/programs/tncfg/tncfg.8	2008-01-29 14:03:15.000000000 +0200
-@@ -61,7 +61,7 @@
- physical device.
- .SH "FILES"
- .PP
--/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
-+/proc/net/ipsec_tncfg, /usr/bin/ipsec
- .SH "SEE ALSO"
- .PP
- ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5)
diff --git a/net-misc/openswan/files/openswan-2.4.11-implicit-decl.patch b/net-misc/openswan/files/openswan-2.4.11-implicit-decl.patch
deleted file mode 100644
index a270589bc05a..000000000000
--- a/net-misc/openswan/files/openswan-2.4.11-implicit-decl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru openswan-2.4.11.orig/programs/pluto/fetch.c openswan-2.4.11/programs/pluto/fetch.c
---- openswan-2.4.11.orig/programs/pluto/fetch.c	2004-06-14 05:01:32.000000000 +0300
-+++ openswan-2.4.11/programs/pluto/fetch.c	2008-01-29 14:39:16.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <openswan.h>
- 
- #ifdef LDAP_VER
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
- #endif
- 
diff --git a/net-misc/openswan/files/openswan-2.4.12-deprecated-ldap.patch b/net-misc/openswan/files/openswan-2.4.12-deprecated-ldap.patch
deleted file mode 100644
index 1b800b899324..000000000000
--- a/net-misc/openswan/files/openswan-2.4.12-deprecated-ldap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru openswan-2.4.12.orig/programs/pluto/fetch.c openswan-2.4.12/programs/pluto/fetch.c
---- openswan-2.4.12.orig/programs/pluto/fetch.c	2004-06-14 05:01:32.000000000 +0300
-+++ openswan-2.4.12/programs/pluto/fetch.c	2008-06-08 16:07:07.000000000 +0300
-@@ -28,6 +28,7 @@
- #include <openswan.h>
- 
- #ifdef LDAP_VER
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
- #endif
- 
diff --git a/net-misc/openswan/files/openswan-2.4.12-gentoo.patch b/net-misc/openswan/files/openswan-2.4.12-gentoo.patch
deleted file mode 100644
index f77ce4304e93..000000000000
--- a/net-misc/openswan/files/openswan-2.4.12-gentoo.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Nru openswan-2.4.12.orig/Makefile.inc openswan-2.4.12/Makefile.inc
---- openswan-2.4.12.orig/Makefile.inc	2008-06-08 16:37:30.000000000 +0300
-+++ openswan-2.4.12/Makefile.inc	2008-06-08 16:30:13.000000000 +0300
-@@ -46,7 +46,7 @@
- DESTDIR?=
- 
- # "local" part of tree, used in building other pathnames
--INC_USRLOCAL=/usr/local
-+INC_USRLOCAL?=/usr
- 
- # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
- # settings which are assumed to include it (or at least, to include *some*
-@@ -91,7 +91,7 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
--FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
- FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-diff -Nru openswan-2.4.12.orig/programs/_confread/_confread.in openswan-2.4.12/programs/_confread/_confread.in
---- openswan-2.4.12.orig/programs/_confread/_confread.in	2008-06-08 16:37:30.000000000 +0300
-+++ openswan-2.4.12/programs/_confread/_confread.in	2008-06-08 16:30:13.000000000 +0300
-@@ -16,5 +16,5 @@
- #
--# Extract configuration info from /etc/ipsec.conf, repackage as assignments
-+# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments
- # to shell variables or tab-delimited fields.  Success or failure is reported
- # inline, as extra data, due to the vagaries of shell backquote handling.
- # In the absence of --varprefix, output is tab-separated fields, like:
-diff -Nru openswan-2.4.12.orig/programs/_confread/ipsec.conf.in openswan-2.4.12/programs/_confread/ipsec.conf.in
---- openswan-2.4.12.orig/programs/_confread/ipsec.conf.in	2008-06-08 16:37:30.000000000 +0300
-+++ openswan-2.4.12/programs/_confread/ipsec.conf.in	2008-06-08 16:30:13.000000000 +0300
-@@ -1,1 +1,1 @@
--# /etc/ipsec.conf - Openswan IPsec configuration file
-+# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file
-diff -Nru openswan-2.4.12.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.12/programs/examples/l2tp-psk.conf.in
---- openswan-2.4.12.orig/programs/examples/l2tp-psk.conf.in	2007-11-02 03:49:40.000000000 +0200
-+++ openswan-2.4.12/programs/examples/l2tp-psk.conf.in	2008-06-08 16:37:41.000000000 +0300
-@@ -11,7 +11,7 @@
- 	#
- 	# Use a Preshared Key. Disable Perfect Forward Secrecy.
- 	#
--	# PreSharedSecret needs to be specified in /etc/ipsec.secrets as
-+	# PreSharedSecret needs to be specified in /etc/ipsec/ipsec.secrets as
- 	# YourIPAddress  %any: "sharedsecret"
- 	authby=secret
- 	pfs=no
-diff -Nru openswan-2.4.12.orig/programs/_include/_include.in openswan-2.4.12/programs/_include/_include.in
---- openswan-2.4.12.orig/programs/_include/_include.in	2008-06-08 16:37:30.000000000 +0300
-+++ openswan-2.4.12/programs/_include/_include.in	2008-06-08 16:30:13.000000000 +0300
-@@ -47,10 +47,10 @@
- do
- 	if test ! -r "$f"
- 	then
--		if test ! "$f" = "/etc/ipsec.conf"
-+		if test ! "$f" = "/etc/ipsec/ipsec.conf"
- 		then
- 			echo "#:cannot open configuration file \'$f\'"
--			if test "$f" = "/etc/ipsec.secrets"
-+			if test "$f" = "/etc/ipsec/ipsec.secrets"
- 			then
- 				echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
- 			fi
-diff -Nru openswan-2.4.12.orig/programs/mailkey/mailkey.in openswan-2.4.12/programs/mailkey/mailkey.in
---- openswan-2.4.12.orig/programs/mailkey/mailkey.in	2008-06-08 16:37:30.000000000 +0300
-+++ openswan-2.4.12/programs/mailkey/mailkey.in	2008-06-08 16:30:13.000000000 +0300
-@@ -60,7 +60,7 @@
- 
- "$test1st"
- 
--Common concerns: This account must be able to read /etc/ipsec.secrets. 
-+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. 
- If you haven't generated your key yet, please run 'ipsec newhostkey'." 
- exit 0
- }
-diff -Nru openswan-2.4.12.orig/programs/pluto/Makefile openswan-2.4.12/programs/pluto/Makefile
---- openswan-2.4.12.orig/programs/pluto/Makefile	2008-06-08 16:37:30.000000000 +0300
-+++ openswan-2.4.12/programs/pluto/Makefile	2008-06-08 16:30:13.000000000 +0300
-@@ -210,7 +210,7 @@
- endif
- 
- ifeq ($(USE_WEAKSTUFF),true)
--WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 #-DUSE_1DES
-+WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 -DUSE_1DES
- endif
- 
- ifeq ($(USE_EXTRACRYPTO),true)
-diff -Nru openswan-2.4.12.orig/programs/setup/Makefile openswan-2.4.12/programs/setup/Makefile
---- openswan-2.4.12.orig/programs/setup/Makefile	2008-06-08 16:37:30.000000000 +0300
-+++ openswan-2.4.12/programs/setup/Makefile	2008-06-08 16:30:13.000000000 +0300
-@@ -33,25 +33,10 @@
- 	@rm -f $(BINDIR)/setup
- 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- 	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
--	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
--	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
--	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
--	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
--	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
--	@echo $(RCDIR)/../rc0.d/K76ipsec
--	@echo $(RCDIR)/../rc1.d/K76ipsec
--	@echo $(RCDIR)/../rc2.d/S47ipsec
--	@echo $(RCDIR)/../rc3.d/S47ipsec
--	@echo $(RCDIR)/../rc4.d/S47ipsec
--	@echo $(RCDIR)/../rc5.d/S47ipsec
--	@echo $(RCDIR)/../rc6.d/K76ipsec
- 
- clean::
- 	@rm -f setup
-diff -Nru openswan-2.4.12.orig/programs/showhostkey/showhostkey.in openswan-2.4.12/programs/showhostkey/showhostkey.in
---- openswan-2.4.12.orig/programs/showhostkey/showhostkey.in	2008-06-08 16:37:30.000000000 +0300
-+++ openswan-2.4.12/programs/showhostkey/showhostkey.in	2008-06-08 16:30:13.000000000 +0300
-@@ -18,7 +18,7 @@
- usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
-                   [--dhclient] [--ipseckey]"
- 
--file=/etc/ipsec.secrets
-+file=/etc/ipsec/ipsec.secrets
- fmt=""
- gw=
- id=
diff --git a/net-misc/openswan/files/openswan-2.6.16-qa-fixes.patch b/net-misc/openswan/files/openswan-2.6.16-qa-fixes.patch
deleted file mode 100644
index ca3b5b26f9ce..000000000000
--- a/net-misc/openswan/files/openswan-2.6.16-qa-fixes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur openswan-2.6.16.orig/include/osw_select.h openswan-2.6.16/include/osw_select.h
---- openswan-2.6.16.orig/include/osw_select.h	2008-08-18 17:07:48.000000000 +0000
-+++ openswan-2.6.16/include/osw_select.h	2008-09-20 20:01:54.000000000 +0000
-@@ -44,6 +44,6 @@
- #define OSW_FD_ISSET(d, s)   ((OSW_FDS_BITS (s)[OSW_FDELT(d)] & OSW_FDMASK(d)) != 0)
- 
- #define osw_select(max, r, f, e, t) \
--		select(max, (fd_set *)(r), (fd_set *)(f), (fd_set *)(e), t)
-+		select(max, (fd_set *)(void *)(r), (fd_set *)(void *)(f), (fd_set *)(void *)(e), t)
- 
- #endif /* _OSW_SELECT_H_ */
-diff -ur openswan-2.6.16.orig/programs/pluto/connections.c openswan-2.6.16/programs/pluto/connections.c
---- openswan-2.6.16.orig/programs/pluto/connections.c	2008-08-18 17:07:48.000000000 +0000
-+++ openswan-2.6.16/programs/pluto/connections.c	2008-09-20 19:29:32.000000000 +0000
-@@ -247,6 +247,15 @@
- #ifdef DEBUG
-     lset_t old_cur_debugging = cur_debugging;
- #endif
-+	union {
-+		struct alg_info**     ppai;
-+#ifdef KERNEL_ALG
-+		struct alg_info_esp** ppai_esp;
-+#endif
-+#ifdef IKE_ALG
-+		struct alg_info_ike** ppai_ike;
-+#endif
-+	} palg_info;
- 
-     set_cur_connection(c);
- 
-@@ -323,10 +332,12 @@
- 
-     gw_delref(&c->gw_info);
- #ifdef KERNEL_ALG
--    alg_info_delref((struct alg_info **)&c->alg_info_esp);
-+    palg_info.ppai_esp = &c->alg_info_esp;
-+    alg_info_delref(palg_info.ppai);
- #endif
- #ifdef IKE_ALG
--    alg_info_delref((struct alg_info **)&c->alg_info_ike);
-+    palg_info.ppai_ike = &c->alg_info_ike;
-+    alg_info_delref(palg_info.ppai);
- #endif
-     pfree(c);
- }
diff --git a/net-misc/openswan/files/openswan-2.6.16-refine-connection.patch b/net-misc/openswan/files/openswan-2.6.16-refine-connection.patch
deleted file mode 100644
index 99bc27e2b200..000000000000
--- a/net-misc/openswan/files/openswan-2.6.16-refine-connection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur openswan-2.6.16.orig/programs/pluto/connections.c openswan-2.6.16/programs/pluto/connections.c
---- openswan-2.6.16.orig/programs/pluto/connections.c	2008-09-21 11:19:47.000000000 +0200
-+++ openswan-2.6.16/programs/pluto/connections.c	2008-09-21 12:24:55.000000000 +0200
-@@ -2395,14 +2395,13 @@
- 	for (; d != NULL; d = d->hp_next)
- 	{
- 	    bool match1 = match_id(peer_id, &d->spd.that.id, &wildcards);
--	    bool match2 = trusted_ca(peer_ca, d->spd.that.ca, &peer_pathlen);
--	    bool match3 = match_requested_ca(c->requested_ca, d->spd.this.ca, &our_pathlen);
--	    bool match = match1 && match2 && match3;
-+	    bool match2 = match_requested_ca(c->requested_ca, d->spd.this.ca, &our_pathlen);
-+	    bool match = match1 && match2;
- 
- 	    DBG(DBG_CONTROLMORE
--		, DBG_log("refine_connection: checking %s against %s, best=%s with match=%d(id=%d/ca=%d/reqca=%d)"
-+		, DBG_log("refine_connection: checking %s against %s, best=%s with match=%d(id=%d/reqca=%d)"
- 			  , c->name, d->name, best_found ? best_found->name : "(none)"
--			  , match, match1, match2, match3));
-+			  , match, match1, match2));
- 
- 	    /* ignore group connections */
- 	    if (d->policy & POLICY_GROUP)
diff --git a/net-misc/openswan/files/openswan-2.6.16-gentoo.patch b/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
index 525326f591c2..8f3301dbd12f 100644
--- a/net-misc/openswan/files/openswan-2.6.16-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
@@ -1,6 +1,6 @@
-diff -ur openswan-2.6.16.orig/Makefile.inc openswan-2.6.16/Makefile.inc
---- openswan-2.6.16.orig/Makefile.inc	2008-08-18 17:07:48.000000000 +0000
-+++ openswan-2.6.16/Makefile.inc	2008-09-20 19:35:17.000000000 +0000
+diff -Nru openswan-2.6.19.orig/Makefile.inc openswan-2.6.19/Makefile.inc
+--- openswan-2.6.19.orig/Makefile.inc	2008-11-25 01:24:56.000000000 +0000
++++ openswan-2.6.19/Makefile.inc	2008-12-03 23:06:52.000000000 +0000
 @@ -49,7 +49,7 @@
  DESTDIR?=
  
@@ -19,9 +19,36 @@ diff -ur openswan-2.6.16.orig/Makefile.inc openswan-2.6.16/Makefile.inc
  EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
  
  FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-diff -ur openswan-2.6.16.orig/programs/setup/Makefile openswan-2.6.16/programs/setup/Makefile
---- openswan-2.6.16.orig/programs/setup/Makefile	2008-08-18 17:07:48.000000000 +0000
-+++ openswan-2.6.16/programs/setup/Makefile	2008-09-20 19:35:17.000000000 +0000
+diff -Nru openswan-2.6.19.orig/programs/Makefile.manpages openswan-2.6.19/programs/Makefile.manpages
+--- openswan-2.6.19.orig/programs/Makefile.manpages	2008-11-25 01:24:56.000000000 +0000
++++ openswan-2.6.19/programs/Makefile.manpages	2008-12-03 23:09:27.000000000 +0000
+@@ -1,19 +1,19 @@
+ # xmlto is from http://cyberelk.net/tim/xmlto/
+ ifneq ($(strip $(XMLTO)),)
+ %.8: %.8.xml
+-	${XMLTO} man $< 
++	${XMLTO} --skip-validation man $< 
+ 	@for m in ipsec_*.8; do if [ -f $$m ]; then mv $$m $@; fi; done
+ 
+ %.5: %.5.xml
+-	${XMLTO} man $< 
++	${XMLTO} --skip-validation man $< 
+ 	@for m in ipsec_*.5; do if [ -f $$m ]; then mv $$m $@; fi; done
+ 
+ %.2: %.2.xml
+-	${XMLTO} man $< 
++	${XMLTO} --skip-validation man $< 
+ 	@for m in ipsec_*.3; do if [ -f $$m ]; then mv $$m $@; fi; done
+ 
+ %.1: %.1.xml
+-	${XMLTO} man $< 
++	${XMLTO} --skip-validation man $< 
+ 	@for m in ipsec_*.1; do if [ -f $$m ]; then mv $$m $@; fi; done
+ endif
+ 
+diff -Nru openswan-2.6.19.orig/programs/setup/Makefile openswan-2.6.19/programs/setup/Makefile
+--- openswan-2.6.19.orig/programs/setup/Makefile	2008-11-25 01:24:56.000000000 +0000
++++ openswan-2.6.19/programs/setup/Makefile	2008-12-03 23:06:52.000000000 +0000
 @@ -18,7 +18,6 @@
  
  # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
diff --git a/net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch b/net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch
new file mode 100644
index 000000000000..00c19b1fae2d
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6.19-qa-fixes.patch
@@ -0,0 +1,11 @@
+diff -Nru openswan-2.6.19.orig/programs/pluto/log.c openswan-2.6.19/programs/pluto/log.c
+--- openswan-2.6.19.orig/programs/pluto/log.c	2008-11-25 01:24:56.000000000 +0000
++++ openswan-2.6.19/programs/pluto/log.c	2008-12-03 23:16:18.000000000 +0000
+@@ -55,6 +55,7 @@
+ #include "kernel_alg.h"
+ #include "ike_alg.h"
+ #include "plutoalg.h"
++#include "virtual.h"
+ 
+ #ifndef NO_DB_OPS_STATS
+ #define NO_DB_CONTEXT
diff --git a/net-misc/openswan/openswan-2.4.11.ebuild b/net-misc/openswan/openswan-2.4.11.ebuild
deleted file mode 100644
index 6cc5ee3a0d3b..000000000000
--- a/net-misc/openswan/openswan-2.4.11.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.11.ebuild,v 1.3 2008/06/28 21:28:48 gentoofan23 Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-HOMEPAGE="http://www.openswan.org/"
-SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms"
-
-COMMON_DEPEND="!net-misc/strongswan
-	>=dev-libs/gmp-4.2.1
-	smartcard? ( dev-libs/opensc )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-		einfo "KLIPS will not be compiled/installed."
-		MYMAKE="programs"
-
-	elif kernel_is 2 4; then
-		if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
-			eerror "You need to have an IPsec enabled 2.4.x kernel."
-			eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
-			die
-		fi
-
-		einfo "Using patched-in IPsec code for kernel 2.4"
-		einfo "Your kernel only supports KLIPS for kernel level IPsec."
-		MYMAKE="confcheck programs"
-
-	else
-		die "Unsupported kernel version"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-implicit-decl.patch
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALCONFDIR=/etc/ipsec \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
-		FINALDOCDIR=/usr/share/doc/${P} \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-	fi
-	echo USE_OE=false # by default, turn off Opportunistic Encryption
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
-	fi
-	echo HAVE_THREADS=${USETHREADS}
-}
-
-src_compile() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
-}
-
-src_install() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
-
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	doinitd "${FILESDIR}"/ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
-}
-
-pkg_preinst() {
-	# Try to fix previous openswan-2.4.9 blooper (#193824)
-	if [[ "${ROOT}" == / ]] && has_version "=net-misc/openswan-2.4.9" ; then
-		elog "Trying to remove empty {rundir,subsysdir} erroneously created by openswan-2.4.9"
-		local base dir
-		for base in / /root/ /etc/ ; do
-			for dir in rundir subsysdir ; do
-				if [[ -d "${base}${dir}" ]]; then
-					rmdir "${base}${dir}" \
-						&& elog "Empty directory ${base}${dir} has been removed" \
-						|| ewarn "Failed to remove ${base}${dir} (perhaps some other package owns it?)"
-				fi
-			done
-		done
-	fi
-}
-
-pkg_postinst() {
-	if kernel_is 2 6; then
-		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
-		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
-		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
-		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
-		check_extra_config
-	fi
-}
diff --git a/net-misc/openswan/openswan-2.4.12.ebuild b/net-misc/openswan/openswan-2.4.12.ebuild
deleted file mode 100644
index 8b590e8d0ce7..000000000000
--- a/net-misc/openswan/openswan-2.4.12.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.12.ebuild,v 1.2 2008/06/08 20:08:38 swegener Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-HOMEPAGE="http://www.openswan.org/"
-SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms"
-
-COMMON_DEPEND="!net-misc/strongswan
-	>=dev-libs/gmp-4.2.1
-	dev-lang/perl
-	smartcard? ( dev-libs/opensc )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-		einfo "KLIPS will not be compiled/installed."
-		MYMAKE="programs"
-
-	elif kernel_is 2 4; then
-		if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
-			eerror "You need to have an IPsec enabled 2.4.x kernel."
-			eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
-			die
-		fi
-
-		einfo "Using patched-in IPsec code for kernel 2.4"
-		einfo "Your kernel only supports KLIPS for kernel level IPsec."
-		MYMAKE="confcheck programs"
-
-	else
-		die "Unsupported kernel version"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
-
-	find . -regex '.*[.][1-8]' -exec sed -i \
-	    -e s:/usr/local:/usr:g \
-	    -e s:/etc/ipsec[.]conf:/etc/ipsec/ipsec.conf:g \
-	    -e s:/etc/ipsec[.]secrets:/etc/ipsec/ipsec.secrets:g '{}' \; ||
-	    die "failed to replace text in xml docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALCONFDIR=/etc/ipsec \
-		FINALCONFFILE=/etc/ipsec/ipsec.conf \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${P} \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-	fi
-	echo USE_OE=false # by default, turn off Opportunistic Encryption
-	echo USE_LWRES=false # needs bind9 with lwres support
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
-	fi
-	echo HAVE_THREADS=${USETHREADS}
-}
-
-src_compile() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
-}
-
-src_install() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
-
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	doinitd "${FILESDIR}"/ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
-}
-
-pkg_postinst() {
-	if kernel_is 2 6; then
-		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
-		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
-		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
-		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
-		check_extra_config
-	fi
-}
diff --git a/net-misc/openswan/openswan-2.4.13-r1.ebuild b/net-misc/openswan/openswan-2.4.13-r2.ebuild
index 41a87dab1619..04a54b38ae80 100644
--- a/net-misc/openswan/openswan-2.4.13-r1.ebuild
+++ b/net-misc/openswan/openswan-2.4.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.13-r1.ebuild,v 1.1 2008/10/12 16:39:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.13-r2.ebuild,v 1.1 2008/12/03 23:30:28 mrness Exp $
 
 inherit eutils linux-info
 
@@ -67,11 +67,11 @@ get_make_options() {
 	echo KERNELSRC=\"${KERNEL_DIR}\" \
 		FINALCONFDIR=/etc/ipsec \
 		FINALCONFFILE=/etc/ipsec/ipsec.conf \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
+		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
 		INC_RCDEFAULT=/etc/init.d \
 		INC_USRLOCAL=/usr \
 		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${P} \
+		FINALDOCDIR=/usr/share/doc/${PF} \
 		DESTDIR=\"${D}\" \
 		USERCOMPILE=\"${CFLAGS}\"
 	if use smartcard ; then
diff --git a/net-misc/openswan/openswan-2.6.18.ebuild b/net-misc/openswan/openswan-2.6.18.ebuild
index df5933851be2..6bf80fa8fb2d 100644
--- a/net-misc/openswan/openswan-2.6.18.ebuild
+++ b/net-misc/openswan/openswan-2.6.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild,v 1.1 2008/10/12 16:39:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.18.ebuild,v 1.2 2008/12/03 23:30:28 mrness Exp $
 
 inherit eutils linux-info
 
@@ -68,11 +68,11 @@ src_unpack() {
 
 get_make_options() {
 	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
+		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
 		INC_RCDEFAULT=/etc/init.d \
 		INC_USRLOCAL=/usr \
 		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${P} \
+		FINALDOCDIR=/usr/share/doc/${PF}/html \
 		DESTDIR=\"${D}\" \
 		USERCOMPILE=\"${CFLAGS}\"
 	if use smartcard ; then
diff --git a/net-misc/openswan/openswan-2.6.16.ebuild b/net-misc/openswan/openswan-2.6.19.ebuild
index 6d14dfb29c98..66a3d4f34da4 100644
--- a/net-misc/openswan/openswan-2.6.16.ebuild
+++ b/net-misc/openswan/openswan-2.6.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.16.ebuild,v 1.1 2008/09/21 12:42:31 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.19.ebuild,v 1.1 2008/12/03 23:30:28 mrness Exp $
 
 inherit eutils linux-info
 
@@ -61,7 +61,6 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-qa-fixes.patch
-	epatch "${FILESDIR}"/${P}-refine-connection.patch
 
 	find . -regex '.*[.][1-8]' -exec sed -i \
 	    -e s:/usr/local:/usr:g '{}' \; ||
@@ -70,11 +69,11 @@ src_unpack() {
 
 get_make_options() {
 	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
+		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
 		INC_RCDEFAULT=/etc/init.d \
 		INC_USRLOCAL=/usr \
 		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${P} \
+		FINALDOCDIR=/usr/share/doc/${PF}/html \
 		DESTDIR=\"${D}\" \
 		USERCOMPILE=\"${CFLAGS}\"
 	if use smartcard ; then