Remove obsolete versions.

(Portage version: 2.1.3.9)

9 files changed, 8 insertions, 1033 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 12be20d3e4cf..055aa0620a3c 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.42 2007/09/26 08:14:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.43 2007/10/22 23:02:50 mrness Exp $
+
+  22 Oct 2007; Alin Năstac <mrness@gentoo.org>
+  -files/openswan-2.4.7-gentoo.patch, -files/openswan-2.4.8-gentoo.patch,
+  -files/openswan-2.4.8-smartcard-typo.patch,
+  -files/openswan-2.4.8-type-punned.patch, -openswan-2.4.7.ebuild,
+  -openswan-2.4.8.ebuild:
+  Remove obsolete versions.
 
 *openswan-2.4.9-r1 (26 Sep 2007)
 
diff --git a/net-misc/openswan/files/digest-openswan-2.4.7 b/net-misc/openswan/files/digest-openswan-2.4.7
deleted file mode 100644
index 04c51dc8d317..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.4.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70f22e8adc39e07a165f75eccb7cd079 openswan-2.4.7.tar.gz 3727456
-RMD160 b84dc9600de491af2c8f0b5183af1b68c8a16ac7 openswan-2.4.7.tar.gz 3727456
-SHA256 b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd openswan-2.4.7.tar.gz 3727456
diff --git a/net-misc/openswan/files/digest-openswan-2.4.8 b/net-misc/openswan/files/digest-openswan-2.4.8
deleted file mode 100644
index b129c324dbd5..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.4.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 918cc56ccf8e5d14cd2047e47450b34a openswan-2.4.8.tar.gz 3734338
-RMD160 f7087fd4f7767059b503689d66a41665af572583 openswan-2.4.8.tar.gz 3734338
-SHA256 b38e8edb94d0414b35e98cca9d49413f87e1873d23fe0969ae1a78c0ea9e6dc6 openswan-2.4.8.tar.gz 3734338
diff --git a/net-misc/openswan/files/openswan-2.4.7-gentoo.patch b/net-misc/openswan/files/openswan-2.4.7-gentoo.patch
deleted file mode 100644
index b3863a584b65..000000000000
--- a/net-misc/openswan/files/openswan-2.4.7-gentoo.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
---- openswan-2.4.7.orig/doc/Makefile	2005-11-08 23:32:45.000000000 +0200
-+++ openswan-2.4.7/doc/Makefile	2006-12-06 22:46:54.732830840 +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.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl
---- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl	2004-07-16 03:24:45.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl	2006-12-06 22:46:54.732830840 +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.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl
---- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2004-07-10 11:07:06.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2006-12-06 22:46:54.736831090 +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.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
---- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2004-07-10 11:07:06.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2006-12-06 22:46:54.736831090 +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.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
---- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2004-07-10 11:07:07.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2006-12-06 22:46:54.736831090 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
---- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2004-07-10 11:07:07.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2006-12-06 22:46:54.736831090 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile
---- openswan-2.4.7.orig/lib/liblwres/Makefile	2004-12-18 20:13:34.000000000 +0200
-+++ openswan-2.4.7/lib/liblwres/Makefile	2006-12-06 22:46:54.736831090 +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.7.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl
---- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl	2006-12-06 22:46:54.736831090 +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.7.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl
---- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl	2006-12-06 22:46:54.740831340 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl
---- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl	2006-12-06 22:46:54.740831340 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc
---- openswan-2.4.7.orig/Makefile.inc	2006-11-14 19:56:09.000000000 +0200
-+++ openswan-2.4.7/Makefile.inc	2006-12-06 22:48:32.534943089 +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
-@@ -239,7 +239,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.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in
---- openswan-2.4.7.orig/programs/barf/barf.in	2006-11-07 05:49:18.000000000 +0200
-+++ openswan-2.4.7/programs/barf/barf.in	2006-12-06 22:46:54.740831340 +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.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5
---- openswan-2.4.7.orig/programs/eroute/eroute.5	2006-10-26 23:40:43.000000000 +0300
-+++ openswan-2.4.7/programs/eroute/eroute.5	2006-12-06 22:57:19.307864340 +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.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8
---- openswan-2.4.7.orig/programs/eroute/eroute.8	2003-10-31 04:32:27.000000000 +0200
-+++ openswan-2.4.7/programs/eroute/eroute.8	2006-12-06 22:46:54.740831340 +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.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in
---- openswan-2.4.7.orig/programs/_include/_include.in	2003-01-06 23:44:04.000000000 +0200
-+++ openswan-2.4.7/programs/_include/_include.in	2006-12-06 22:46:54.740831340 +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.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8
---- openswan-2.4.7.orig/programs/ipsec/ipsec.8	2003-02-27 18:51:54.000000000 +0200
-+++ openswan-2.4.7/programs/ipsec/ipsec.8	2006-12-06 22:46:54.744831590 +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.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5
---- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5	2006-10-27 01:21:25.000000000 +0300
-+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5	2006-12-06 22:58:04.150666840 +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.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8
---- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8	2006-10-27 01:21:25.000000000 +0300
-+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8	2006-12-06 22:58:22.295800840 +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.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in
---- openswan-2.4.7.orig/programs/mailkey/mailkey.in	2006-10-29 02:49:23.000000000 +0300
-+++ openswan-2.4.7/programs/mailkey/mailkey.in	2006-12-06 22:46:54.828836839 +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.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile
---- openswan-2.4.7.orig/programs/pluto/Makefile	2006-11-07 17:55:52.000000000 +0200
-+++ openswan-2.4.7/programs/pluto/Makefile	2006-12-06 22:46:54.832837088 +0200
-@@ -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.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile
---- openswan-2.4.7.orig/programs/setup/Makefile	2004-12-18 20:13:43.000000000 +0200
-+++ openswan-2.4.7/programs/setup/Makefile	2006-12-06 22:46:54.832837088 +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.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in
---- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in	2004-11-14 15:40:41.000000000 +0200
-+++ openswan-2.4.7/programs/showhostkey/showhostkey.in	2006-12-06 22:46:54.844837840 +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.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5
---- openswan-2.4.7.orig/programs/spi/spi.5	2006-10-26 23:53:59.000000000 +0300
-+++ openswan-2.4.7/programs/spi/spi.5	2006-12-06 23:00:11.910340779 +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.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8
---- openswan-2.4.7.orig/programs/spi/spi.8	2006-10-30 22:00:04.000000000 +0200
-+++ openswan-2.4.7/programs/spi/spi.8	2006-12-06 23:00:27.043286530 +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.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5
---- openswan-2.4.7.orig/programs/spigrp/spigrp.5	2006-10-26 23:50:29.000000000 +0300
-+++ openswan-2.4.7/programs/spigrp/spigrp.5	2006-12-06 23:01:25.650949280 +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.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8
---- openswan-2.4.7.orig/programs/spigrp/spigrp.8	2006-10-26 23:50:29.000000000 +0300
-+++ openswan-2.4.7/programs/spigrp/spigrp.8	2006-12-06 23:01:39.079788532 +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.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5
---- openswan-2.4.7.orig/programs/tncfg/tncfg.5	2006-10-26 23:58:11.000000000 +0300
-+++ openswan-2.4.7/programs/tncfg/tncfg.5	2006-12-06 23:01:59.385057530 +0200
-@@ -101,7 +101,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
-+/proc/net/ipsec_tncfg, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8
---- openswan-2.4.7.orig/programs/tncfg/tncfg.8	2006-10-26 23:58:11.000000000 +0300
-+++ openswan-2.4.7/programs/tncfg/tncfg.8	2006-12-06 23:02:09.245673780 +0200
-@@ -63,7 +63,7 @@
- .SH "FILES"
- 
- .PP
--/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
-+/proc/net/ipsec_tncfg, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
diff --git a/net-misc/openswan/files/openswan-2.4.8-gentoo.patch b/net-misc/openswan/files/openswan-2.4.8-gentoo.patch
deleted file mode 100644
index 5a435a84f338..000000000000
--- a/net-misc/openswan/files/openswan-2.4.8-gentoo.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-diff -Nru openswan-2.4.8.orig/doc/Makefile openswan-2.4.8/doc/Makefile
---- openswan-2.4.8.orig/doc/Makefile	2005-11-08 23:32:45.000000000 +0200
-+++ openswan-2.4.8/doc/Makefile	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.8/lib/libcrypto/libdes/asm/crypt586.pl
---- openswan-2.4.8.orig/lib/libcrypto/libdes/asm/crypt586.pl	2004-07-16 03:24:45.000000000 +0300
-+++ openswan-2.4.8/lib/libcrypto/libdes/asm/crypt586.pl	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.8/lib/libcrypto/libdes/asm/perlasm/cbc.pl
---- openswan-2.4.8.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2004-07-10 11:07:06.000000000 +0300
-+++ openswan-2.4.8/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.8/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
---- openswan-2.4.8.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2004-07-10 11:07:06.000000000 +0300
-+++ openswan-2.4.8/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.8/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
---- openswan-2.4.8.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2004-07-10 11:07:07.000000000 +0300
-+++ openswan-2.4.8/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2007-06-04 23:28:53.000000000 +0300
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Nru openswan-2.4.8.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.8/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
---- openswan-2.4.8.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2004-07-10 11:07:07.000000000 +0300
-+++ openswan-2.4.8/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2007-06-04 23:28:53.000000000 +0300
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Nru openswan-2.4.8.orig/lib/liblwres/Makefile openswan-2.4.8/lib/liblwres/Makefile
---- openswan-2.4.8.orig/lib/liblwres/Makefile	2004-12-18 20:13:34.000000000 +0200
-+++ openswan-2.4.8/lib/liblwres/Makefile	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.8/linux/net/ipsec/des/asm/des-586.pl
---- openswan-2.4.8.orig/linux/net/ipsec/des/asm/des-586.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.8/linux/net/ipsec/des/asm/des-586.pl	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.8/linux/net/ipsec/des/asm/des686.pl
---- openswan-2.4.8.orig/linux/net/ipsec/des/asm/des686.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.8/linux/net/ipsec/des/asm/des686.pl	2007-06-04 23:28:53.000000000 +0300
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Nru openswan-2.4.8.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.8/linux/net/ipsec/des/asm/desboth.pl
---- openswan-2.4.8.orig/linux/net/ipsec/des/asm/desboth.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.8/linux/net/ipsec/des/asm/desboth.pl	2007-06-04 23:28:53.000000000 +0300
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Nru openswan-2.4.8.orig/Makefile.inc openswan-2.4.8/Makefile.inc
---- openswan-2.4.8.orig/Makefile.inc	2007-05-23 18:40:39.000000000 +0300
-+++ openswan-2.4.8/Makefile.inc	2007-06-04 23:28:53.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*
-@@ -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
-@@ -239,7 +239,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.8.orig/programs/barf/barf.in openswan-2.4.8/programs/barf/barf.in
---- openswan-2.4.8.orig/programs/barf/barf.in	2006-11-07 05:49:18.000000000 +0200
-+++ openswan-2.4.8/programs/barf/barf.in	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/eroute/eroute.5 openswan-2.4.8/programs/eroute/eroute.5
---- openswan-2.4.8.orig/programs/eroute/eroute.5	2006-10-26 23:40:43.000000000 +0300
-+++ openswan-2.4.8/programs/eroute/eroute.5	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/eroute/eroute.8 openswan-2.4.8/programs/eroute/eroute.8
---- openswan-2.4.8.orig/programs/eroute/eroute.8	2003-10-31 04:32:27.000000000 +0200
-+++ openswan-2.4.8/programs/eroute/eroute.8	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/_include/_include.in openswan-2.4.8/programs/_include/_include.in
---- openswan-2.4.8.orig/programs/_include/_include.in	2003-01-06 23:44:04.000000000 +0200
-+++ openswan-2.4.8/programs/_include/_include.in	2007-06-04 23:28:53.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.8.orig/programs/ipsec/ipsec.8 openswan-2.4.8/programs/ipsec/ipsec.8
---- openswan-2.4.8.orig/programs/ipsec/ipsec.8	2003-02-27 18:51:54.000000000 +0200
-+++ openswan-2.4.8/programs/ipsec/ipsec.8	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.8/programs/klipsdebug/klipsdebug.5
---- openswan-2.4.8.orig/programs/klipsdebug/klipsdebug.5	2006-10-27 01:21:25.000000000 +0300
-+++ openswan-2.4.8/programs/klipsdebug/klipsdebug.5	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.8/programs/klipsdebug/klipsdebug.8
---- openswan-2.4.8.orig/programs/klipsdebug/klipsdebug.8	2006-10-27 01:21:25.000000000 +0300
-+++ openswan-2.4.8/programs/klipsdebug/klipsdebug.8	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/mailkey/mailkey.in openswan-2.4.8/programs/mailkey/mailkey.in
---- openswan-2.4.8.orig/programs/mailkey/mailkey.in	2006-10-29 02:49:23.000000000 +0300
-+++ openswan-2.4.8/programs/mailkey/mailkey.in	2007-06-04 23:28:53.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.8.orig/programs/setup/Makefile openswan-2.4.8/programs/setup/Makefile
---- openswan-2.4.8.orig/programs/setup/Makefile	2004-12-18 20:13:43.000000000 +0200
-+++ openswan-2.4.8/programs/setup/Makefile	2007-06-04 23:28:53.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.8.orig/programs/showhostkey/showhostkey.in openswan-2.4.8/programs/showhostkey/showhostkey.in
---- openswan-2.4.8.orig/programs/showhostkey/showhostkey.in	2004-11-14 15:40:41.000000000 +0200
-+++ openswan-2.4.8/programs/showhostkey/showhostkey.in	2007-06-04 23:28:53.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 -Nru openswan-2.4.8.orig/programs/showpolicy/showpolicy.8 openswan-2.4.8/programs/showpolicy/showpolicy.8
---- openswan-2.4.8.orig/programs/showpolicy/showpolicy.8	2005-01-11 19:52:50.000000000 +0200
-+++ openswan-2.4.8/programs/showpolicy/showpolicy.8	2007-06-04 23:31:19.000000000 +0300
-@@ -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.8.orig/programs/spi/spi.5 openswan-2.4.8/programs/spi/spi.5
---- openswan-2.4.8.orig/programs/spi/spi.5	2006-10-26 23:53:59.000000000 +0300
-+++ openswan-2.4.8/programs/spi/spi.5	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/spi/spi.8 openswan-2.4.8/programs/spi/spi.8
---- openswan-2.4.8.orig/programs/spi/spi.8	2006-10-30 22:00:04.000000000 +0200
-+++ openswan-2.4.8/programs/spi/spi.8	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/spigrp/spigrp.5 openswan-2.4.8/programs/spigrp/spigrp.5
---- openswan-2.4.8.orig/programs/spigrp/spigrp.5	2006-10-26 23:50:29.000000000 +0300
-+++ openswan-2.4.8/programs/spigrp/spigrp.5	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/spigrp/spigrp.8 openswan-2.4.8/programs/spigrp/spigrp.8
---- openswan-2.4.8.orig/programs/spigrp/spigrp.8	2006-10-26 23:50:29.000000000 +0300
-+++ openswan-2.4.8/programs/spigrp/spigrp.8	2007-06-04 23:28:53.000000000 +0300
-@@ -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.8.orig/programs/tncfg/tncfg.5 openswan-2.4.8/programs/tncfg/tncfg.5
---- openswan-2.4.8.orig/programs/tncfg/tncfg.5	2006-11-24 06:34:10.000000000 +0200
-+++ openswan-2.4.8/programs/tncfg/tncfg.5	2007-06-04 23:30:07.000000000 +0300
-@@ -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.8.orig/programs/tncfg/tncfg.8 openswan-2.4.8/programs/tncfg/tncfg.8
---- openswan-2.4.8.orig/programs/tncfg/tncfg.8	2006-11-24 06:34:10.000000000 +0200
-+++ openswan-2.4.8/programs/tncfg/tncfg.8	2007-06-04 23:30:13.000000000 +0300
-@@ -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 -Nru openswan-2.4.8.orig/programs/pluto/Makefile openswan-2.4.8/programs/pluto/Makefile
---- openswan-2.4.8.orig/programs/pluto/Makefile	2006-11-07 17:55:52.000000000 +0200
-+++ openswan-2.4.8/programs/pluto/Makefile	2007-06-04 23:28:53.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)
-@@ -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 --git a/net-misc/openswan/files/openswan-2.4.8-smartcard-typo.patch b/net-misc/openswan/files/openswan-2.4.8-smartcard-typo.patch
deleted file mode 100644
index 8c233bf64517..000000000000
--- a/net-misc/openswan/files/openswan-2.4.8-smartcard-typo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naupr openswan-2.4.8-old/programs/pluto/smartcard.c openswan-2.4.8/programs/pluto/smartcard.c
---- openswan-2.4.8-old/programs/pluto/smartcard.c	2007-01-22 19:42:02.000000000 +0100
-+++ openswan-2.4.8/programs/pluto/smartcard.c	2007-06-09 20:50:48.000000000 +0200
-@@ -381,8 +381,7 @@ scx_sign_hash(smartcard_t *sc UNUSED
-     sc_pkcs15_hex_string_to_id(sc->id, &id);
- 
-     /* get private key by id */
--    r = sc_pkcs15_find_prkey_by_id_usage(p15card, &id, SC_PKCS15_PRKEY_USAGE_SI
--GN | SC_PKCS15_PRKEY_USAGE_SIGNRECOVER, &key);
-+    r = sc_pkcs15_find_prkey_by_id_usage(p15card, &id, SC_PKCS15_PRKEY_USAGE_SIGN | SC_PKCS15_PRKEY_USAGE_SIGNRECOVER, &key);
- 
-     if (r < 0)
-     {
diff --git a/net-misc/openswan/files/openswan-2.4.8-type-punned.patch b/net-misc/openswan/files/openswan-2.4.8-type-punned.patch
deleted file mode 100644
index 81d3cc995d30..000000000000
--- a/net-misc/openswan/files/openswan-2.4.8-type-punned.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nru openswan-2.4.8.orig/programs/pluto/connections.c openswan-2.4.8/programs/pluto/connections.c
---- openswan-2.4.8.orig/programs/pluto/connections.c	2007-01-23 17:37:06.000000000 +0200
-+++ openswan-2.4.8/programs/pluto/connections.c	2007-06-05 09:44:35.000000000 +0300
-@@ -364,6 +364,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);
- 
-@@ -439,10 +448,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/openswan-2.4.7.ebuild b/net-misc/openswan/openswan-2.4.7.ebuild
deleted file mode 100644
index 57c415e889af..000000000000
--- a/net-misc/openswan/openswan-2.4.7.ebuild
+++ /dev/null
@@ -1,96 +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/openswan/openswan-2.4.7.ebuild,v 1.3 2007/05/24 14:14:19 gustavoz 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=""
-
-COMMON_DEPEND="!net-misc/strongswan
-	>=dev-libs/gmp-4.2.1"
-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 /usr/src/linux/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 "Unrecognised kernel version"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	make \
-		DESTDIR="${D}" \
-		USERCOMPILE="${CFLAGS}" \
-		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} \
-		${MYMAKE} || die "make failed"
-}
-
-src_install() {
-	make \
-		DESTDIR="${D}" \
-		USERCOMPILE="${CFLAGS}" \
-		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} \
-		install || die "make install failed"
-
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	doinitd "${FILESDIR}"/ipsec
-
-	fperms -R a-X /etc/ipsec /usr/share
-	keepdir /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.8.ebuild b/net-misc/openswan/openswan-2.4.8.ebuild
deleted file mode 100644
index 66bc7ba65a4b..000000000000
--- a/net-misc/openswan/openswan-2.4.8.ebuild
+++ /dev/null
@@ -1,108 +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/openswan/openswan-2.4.8.ebuild,v 1.2 2007/06/14 18:52:33 mrness 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="smartcard extra-algorithms weak-algorithms"
-
-COMMON_DEPEND="!net-misc/strongswan
-	>=dev-libs/gmp-4.2.1
-	smartcard? ( dev-libs/opensc )"
-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 /usr/src/linux/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}-type-punned.patch
-	epatch "${FILESDIR}"/${P}-smartcard-typo.patch
-}
-
-get_make_options() {
-	local MY_MAKE_OPTIONS="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}"
-	if use smartcard ; then
-		MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_SMARTCARD=true"
-	fi
-	if use extra-algorithms ; then
-		MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_EXTRACRYPTO=true"
-	fi
-	if use weak-algorithms ; then
-		MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_WEAKSTUFF=true"
-	fi
-	echo ${MY_MAKE_OPTIONS}
-}
-
-src_compile() {
-	make \
-		DESTDIR="${D}" \
-		USERCOMPILE="${CFLAGS}" \
-		$(get_make_options) \
-		${MYMAKE} || die "make failed"
-}
-
-src_install() {
-	make \
-		DESTDIR="${D}" \
-		USERCOMPILE="${CFLAGS}" \
-		$(get_make_options) \
-		install || die "make install failed"
-
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	doinitd "${FILESDIR}"/ipsec
-
-	fperms -R a-X /etc/ipsec /usr/share
-	keepdir /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
-}