pluto creates /var/run/pluto on startup, so don't call keepdir. Bug 448834 by flameeyes. Remove old.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

13 files changed, 24 insertions, 1474 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index b0fd88b94824..a87870d89663 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/openswan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.85 2012/09/14 22:29:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.86 2012/12/27 15:24:03 floppym Exp $
+
+  27 Dec 2012; Mike Gilbert <floppym@gentoo.org> -files/ipsec,
+  -files/openswan-2.4-allow-ms-bad-proposal.patch,
+  -files/openswan-2.4.15-deprecated-ldap.patch,
+  -files/openswan-2.4.15-gentoo.patch, -files/openswan-2.6.31-gentoo.patch,
+  -files/openswan-2.6.37-gentoo.patch, -openswan-2.4.15-r2.ebuild,
+  -openswan-2.6.31.ebuild, -openswan-2.6.37-r1.ebuild, -openswan-2.6.37.ebuild,
+  openswan-2.6.38.ebuild:
+  pluto creates /var/run/pluto on startup, so don't call keepdir. Bug 448834 by
+  flameeyes. Remove old.
 
   14 Sep 2012; Agostino Sarubbo <ago@gentoo.org> openswan-2.6.38.ebuild:
   Stable for amd64, wrt bug #434606
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index b5265a2c1a34..f93812f8324f 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,20 +1,17 @@
-AUX ipsec 1551 SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21 SHA512 fbe7df19596d6d2e253e05f08e6d8b50fe5229cc4c885839a307e29ac3fa83ced03aae6e7b6614a9b03736566673e37e30f6366de81757a7b431bbd1bec33e9e WHIRLPOOL cf6072fcf4d38693fac61edad350ef8cc6b4d091ec9296921fc25a288285dd2e746b1617c4ac31636878908368f88a1753d8931635019a934154b70bd0c9d834
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ipsec-initd 487 SHA256 e86140b6e596a0b0d6e52ca521adb891eb3b9cc4ad8e6f28041fb773f9f60347 SHA512 5ee9163625b32efbe6a1210bd9a8e91f7216ef20dd9dd4c8f32370a8945a949e200b7786c5947c35822389f6fa41890be4641c58bb9d1ce271e631d7a0f0c7d0 WHIRLPOOL 51900362cfa07db14c31e3015855690d0cf1b37668b603f72348b351fc69f9ae7122d0af257ea5250fb5b45a71e816c849577b20be1860f8f764bfebd988dac3
-AUX openswan-2.4-allow-ms-bad-proposal.patch 481 SHA256 30cc482b9cd3b47699a94c77c7ac16c047913a55d7c66d11e60ea213db84f39d SHA512 0672b19f42f5f121af114ac404212b37453d158f242d86bfb244152b87463b3a62e14385e50401e545f60d52c6868dbc724dc0461ce9450f88bd9d6622c21748 WHIRLPOOL ff405e62738059a1ccb199fba8579713bafda9fcd0dc1b51586465c811c06626df88dc129037fdc916d3c771330e567141f38d9d997211c464fcbcca910be2dc
-AUX openswan-2.4.15-deprecated-ldap.patch 372 SHA256 e891c8daa25dd8a06b6cc070cdc9913f260c375cf7a794b496a430e029e660bc SHA512 902bd3c73fa69fabf6ad583fa4717e3e1540499c3718d8c21f64fc5c0d4322135aefca881854782ea88be075a36c41097867d7cd7005198d88f351d29fea9716 WHIRLPOOL 0638cd1df49fdf805213de7aab4571df6bcd7d18427161af6dd4fe8cb1e71ae67cafccf37d43b0b962382346a7194a3a04251a0db5ce776f7d38cb5e89b2ecd9
-AUX openswan-2.4.15-gentoo.patch 7744 SHA256 792055fe57e1a7756d5e804bdbbdf76e009b9b4e60141125bd92c464ec46d946 SHA512 3b71872febcba11b738fd532510926091b4ac53266fe15585d4c3a78c6ad4073313b9a22238d3fbe69ab7d152405c323e8245069f5333d10c4edafbf68dc85e8 WHIRLPOOL 31c7bdd035a440e00feee001f9831b5864f3f8b804051e86d6525ff7a5681e1c65b63e4487aa49ad7bd1a0a42ea01b16a534bddbc5756f697882bf6bcc9e8abf
 AUX openswan-2.6-allow-ms-bad-proposal.patch 551 SHA256 3c84444f6181c0b7f7749c828db790e20f637d93d9dacec8e120709cce8adcc0 SHA512 9a41f6d8e7cce99d96ff11ea5a50288831a3e30c5cb0b5be5f21dcd3d09f7c0968f78235693408f18b80a651e9d86955446106bc775213ad159ae6b6a830b407 WHIRLPOOL dbc025dd6bd4249e99f18bb0d6ae52e14ac5a6bd7de7de81147acd4d65985ee24eb18e4fdf4f9e2ae4e54af817940a940b5561a65a65c28dc1ecb2ef759f4005
-AUX openswan-2.6.31-gentoo.patch 9990 SHA256 2784539e8cefe8a0938f5d37703c44f7279ad45fa9fb39c5dcd8b51b4b8ae690 SHA512 fc3a324c53bac22d53e8555829031a73df0b60ab505a1e1329de7c4de1c90b36610bae2d04b1b805733fdfbc01b16a6c06dd174d6896cab0f89e879e7ebf8469 WHIRLPOOL f554a095c23fab43a5f933d1c545af1108eef3fc6c7d5729131e9fa9a9ce6cdf05c851a3fd9e46737ecf5632233298ec8d6950e9afa3b6c8aa3115292d9acc98
-AUX openswan-2.6.37-gentoo.patch 10062 SHA256 8e467b283aa44739be50b2804c84b5c8bd1742bdba36d5c84db983491a8f8ddb SHA512 53f0dae9d0a3823fded704b47f348fded39bab38f194de2f424826e205318a28527fc01e6b85914d0480418d8361a8ca412f96d3ff518ee5f355bba84abcfbbe WHIRLPOOL d4288c972da12ca68847d5c3e8db1f627629deb60ba0d09652ed86aa078343271277e446e0a6a4f6bf1058d146bee62a82468119d42e8e0ae202df5cb320ee9b
 AUX openswan-2.6.38-gentoo.patch 9913 SHA256 b1f12f7cb0da2db047e7a21b2895d9a7b1562f426af111853e1c13141e7c874b SHA512 829668e4693fd822097c549b0d1829c6b92ae4ec0ad1a04944fa34d79eec03168560166df8272930c397517a68aa350f42dc3d2c74982e0c17338f2a23d6e218 WHIRLPOOL 5af74c3e1c2fb05b14b3e046fab8245bfe5ba5be8eae28d52482fbd86556b2612e8cb0371822d207b3e2f08e0223675e212092dc7690920b5a9f16fa8eaf057e
-DIST openswan-2.4.15.tar.gz 3938290 SHA256 cf85bf896dd2b0b0818d2851f4d8ec61f816f777d47cbfed7065a682ffd47293
-DIST openswan-2.6.31.tar.gz 11677821 SHA256 bddd2ca79fec2326a69904b59df15753e59b1bf02882416b19507516e9cfcc21
-DIST openswan-2.6.37.tar.gz 11238286 SHA256 235a8e0207db661d533368037b2d6d3e9a300cca37e0ed0e906d96fee3a8cc62 SHA512 81cf0f47f59bc97f909522208e3d17f8666581ac5830b52400444cdae046aef415fd8ba06963dabee6f8a8503fa90edcccf6ca978d60117b9512d4e608f6077d WHIRLPOOL 6592b8e03ab0a0d0d3541a312c1507d35f4c8417203aad5e7add8df96f537ee559bc6e95c9a3b6c938225862de1d1e263f3693f2875c0aed8037e28063d7fc7e
 DIST openswan-2.6.38.tar.gz 10861574 SHA256 bdd3ccf31df1f3e8530887986ea8b6702a3db139486738213f5de8d8690b3723 SHA512 0963a9df548c901eb562185f97d844f57539668f11fbe2a43712223773053895c761b1d5d0be4fffa64014baf58ff2d7cf23676a3da51c5a5134b0639796ad10 WHIRLPOOL e270de7eceee7964148910ed4ec35a39df002ebca3ca892d9f13a2a06eaf1476019c5ac8830eb24c9389afb8256d43ea580d7a3d29dc828be88608a9535d9668
-EBUILD openswan-2.4.15-r2.ebuild 3950 SHA256 5c00e82e2da652bfd6426ee2102f74fa9323a18248cdd55904675507a65ca6d6 SHA512 5abd4e97b7acbdba2f3164531c2cb2bffa3e2e17912d47d7cdb5eda9d1ad87a84a8d5eb88142fb0341ff19c33c14781c21d1d91e0ba59c9c5e45d256f9c8e8c7 WHIRLPOOL 61d0fcdf491e84031206c29c4775f92bac7314ebdec4a47f8fa1a99fe862cf76564d15f1ec876e36bed9dc9c02defd4f4d440f19b8d4cf1e46277635d0b8fd35
-EBUILD openswan-2.6.31.ebuild 5292 SHA256 6a426c2b72b918620e611a3ff6185ad604ebb96bbb91c4ac1fc18d8874ca5548 SHA512 2e2d3aa8050a0da959c2754efbd929556079d18d3c2a9e80de371c59c260582f813ae107938b5433f031f4fc2ac48f53da1f8aa52b20f0808b6d73a89de60d6e WHIRLPOOL 8896baac78de958dd54d8dbbccf8c7da95b315a6a68554d38a7be586c50a66245c44ca55e8614ba620c5f02d68fc39e92b61ca3d607757576385b24928b324d4
-EBUILD openswan-2.6.37-r1.ebuild 5219 SHA256 72e5ad84fd4c4b1062a1db907aa50271442bba6b1009f4f125d15adfe4b7a7ab SHA512 a90d771430f5a64dc8599c69d37b4177a440bd26be8f2729c0bc5590a19c61ea6c3373ccc500d548336999ceb58e53acb37518f20714cf69574464819079c413 WHIRLPOOL 649c277252562047bf4eaf2426ccb1ea2cca2c6522b4d08a332b93e72bc4d0d794cd03136c41998fc446dfa168bd3941b7a379b5a2fbd5df0b64d5a37d167bfa
-EBUILD openswan-2.6.37.ebuild 5367 SHA256 23b815a13eb5ea07d4ac5c91eecd60ee8a0103a032220bc97c443af5d8790aa5 SHA512 eaea6a78fbee475b65d8d819ca8cc9c7fee7bfdf7c2baafda16e6a68bd5c94b18afb4ace8b9f512fa0d9352331708f4251a0adcf07c38e65a6d5d04256811a77 WHIRLPOOL 39817eefbf041a2cacf17a410f6698438c71bf287c2229f526813873211f7a431fbd559c4c1d9d8e8c5d2513d544aff6c3c57c729325b1645df4e2428a5ab31d
-EBUILD openswan-2.6.38.ebuild 5229 SHA256 945eadf6e086ef6865347f61ccbb1e8b4a4c7044aff41d8fe3c9653dd86f063b SHA512 99f2dfc3cfb757e1cc72e6391ab152e9a6f3e18009625b48d171e94ab0dd9ab3d7112b51b809a0a8e9ec3ce21712d3791c99c1915e8d363bf23856369b64b1f0 WHIRLPOOL 729306f71ab6f270e765affe1fbbbb70adfd71e30832b6caaddb1ffa70adba9778bf015fe6dd0e91a83653311fcce2bee76d235087b1bb8402323916369f7fb0
-MISC ChangeLog 16788 SHA256 7ee8fcfb3a967e3856c4395d5f7f3a458f53eeaa624882c480e64e94efa8c684 SHA512 b4760f0d6176c7c00b614f85b9380ac7b573f986965e1cccb36151449ec9a8c224ccde3ec13ea2f192dfe5403ee17b03851cb66e1154c8a630d442d6ec25e9d4 WHIRLPOOL 8a45a4d33ed643dbc8fda180d2628111f6528c61e523ceda22cdd125c0782aebb4ea0e52ba4bfafc3e6a5cfd16566efb40584cc5b6f8ec6c2414c0e11a1d852c
+EBUILD openswan-2.6.38.ebuild 5208 SHA256 3d26aa4327ee904c90a45b1ec963614df511ab33b4bae53a37753629b3389c9b SHA512 6f14d2cdf467071b2609e592494728e5a30c9108e2610cf52012bd169cb454b3b334cc760d908ee056e62d9d1011cf6926ade3948638767c684727bc61afc729 WHIRLPOOL ed2d370d44c80f1092cbfa62c237a7881ad170e25435d9ba0a0171832aa397936aee87860f24ad87dc98379da15f7d7f28a14cfd73a492a3784f0694e06fda6c
+MISC ChangeLog 17309 SHA256 7b60cbf330c3625d920d24a7665ae63d3e2986c2f966337082f8b84e72af94f6 SHA512 7eae22d717ca87b84eb295876c6914f5e49aa4de686e56e70c317f038b20e816810900a4df60121f2343cc509175f1b8e0dcb88695e2f24aa8cd669cba23f390 WHIRLPOOL 38e6f69ad3290641cecbb372b6f680e398ba57c49c2cf62c1218656a584153fe74bc7aa8794ff0e6cb249e72c3c490c46d21eaf10f3a4f7dd8b272e3fd3d23a0
 MISC metadata.xml 1263 SHA256 ac58e5bb73a762f946fbf19ff86a88e37f49d2506ab81922719759aa2f05b691 SHA512 f9ab4892874bd4ca725356f7b72530068b840c7f2676d8037f8783f82e24e004a6c55bbc20efb1ca464645aabc6b7da443df646e993a913bf262a1cb9531b685 WHIRLPOOL 9bdac57b4b54649fcff20123812bbc0420eb57d89fcec2da725904c2950ce55da0554cdca62a31cc6ac22047bb32c321f6c24aeb5bfcc80ee1f77be8496f5622
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDcaBQACgkQC77qH+pIQ6TMXAD/als111VGbULU5tSjn2Vy5uam
+pO2opxtZDPsilhJQJEIBAJnstfms/b/3UpUPekRoSBn6nBDDtvZG44Z2WOZ8r92B
+=xZDV
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/ipsec b/net-misc/openswan/files/ipsec
deleted file mode 100644
index 2d4bf293e6e1..000000000000
--- a/net-misc/openswan/files/ipsec
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-
-# IPsec startup and shutdown script
-# Copyright (C) 1998, 1999, 2001  Henry Spencer.
-# Gentoo mods (C) 2003 Anthony de Boer
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-
-depend() {
-	need net logger
-	after dns
-}
-
-ipsecdoit() {
-# Pick up IPsec configuration (until we have done this, successfully, we
-# do not know where errors should go, hence the explicit "daemon.error"s.)
-# Note the "--export", which exports the variables created.
-	eval `ipsec _confread --varprefix IPSEC --export --type config setup`
-	if test " $IPSEC_confreadstatus" != " "
-	then
-		echo "$IPSEC_confreadstatus -- \`$1' aborted" |
-			logger -s -p daemon.error -t ipsec_setup
-		return 1
-	fi
-	IPSECsyslog=${IPSECsyslog-daemon.error}
-	export IPSECsyslog
-	umask 022
-	tmp=/var/run/ipsec_setup.st
-	(
-		ipsec _realsetup $1
-		echo "$?" >$tmp
-	) 2>&1 | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
-	st=`cat $tmp`
-	rm -f $tmp
-	return $st
-}
-
-start() {
-	ebegin "Starting IPSEC ..."
-	ipsecdoit start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping IPSEC ..."
-	ipsecdoit stop
-	eend $?
-}
-
diff --git a/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch b/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch
deleted file mode 100644
index 8f50cbb8e17d..000000000000
--- a/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru openswan-2.4.15.orig/programs/pluto/Makefile openswan-2.4.15/programs/pluto/Makefile
---- openswan-2.4.15.orig/programs/pluto/Makefile	2009-09-11 18:32:38.000000000 +0200
-+++ openswan-2.4.15/programs/pluto/Makefile	2009-09-11 19:35:33.000000000 +0200
-@@ -244,6 +244,7 @@
- 	-DGCC_LINT \
- 	-DUSE_AES -DUSE_3DES \
- 	-DIKE_ALG -DKERNEL_ALG -DDB_CONTEXT \
-+	-DALLOW_MICROSOFT_BAD_PROPOSAL \
- 	${AGGRESSIVE_DEFS} \
- 	${XAUTH_DEFS} ${XAUTHPAM_DEFS} \
- 	${NAT_DEFS} ${CURL_DEFS}\
diff --git a/net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch b/net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch
deleted file mode 100644
index 33c70e83a30a..000000000000
--- a/net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru openswan-2.4.15.orig/programs/pluto/fetch.c openswan-2.4.15/programs/pluto/fetch.c
---- openswan-2.4.15.orig/programs/pluto/fetch.c	2004-06-14 04:01:32.000000000 +0200
-+++ openswan-2.4.15/programs/pluto/fetch.c	2009-06-28 11:24:17.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.15-gentoo.patch b/net-misc/openswan/files/openswan-2.4.15-gentoo.patch
deleted file mode 100644
index 35ccb2f24a0c..000000000000
--- a/net-misc/openswan/files/openswan-2.4.15-gentoo.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -Nru openswan-2.4.15.orig/lib/liblwres/Makefile openswan-2.4.15/lib/liblwres/Makefile
---- openswan-2.4.15.orig/lib/liblwres/Makefile	2007-10-22 16:33:11.000000000 +0200
-+++ openswan-2.4.15/lib/liblwres/Makefile	2009-06-28 11:21:35.000000000 +0200
-@@ -17,8 +17,8 @@
- 
- CINCLUDES =	-I${srcdir}/unix/include \
- 		-I. -I./include -I${srcdir}/include 
--CDEFINES = -g
--CWARNINGS = -Werror
-+CDEFINES =
-+CWARNINGS =
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.4.15.orig/Makefile.inc openswan-2.4.15/Makefile.inc
---- openswan-2.4.15.orig/Makefile.inc	2009-06-25 06:01:16.000000000 +0200
-+++ openswan-2.4.15/Makefile.inc	2009-06-28 11:21:35.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*
-@@ -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.15.orig/programs/_confread/_confread.in openswan-2.4.15/programs/_confread/_confread.in
---- openswan-2.4.15.orig/programs/_confread/_confread.in	2006-04-12 21:55:42.000000000 +0200
-+++ openswan-2.4.15/programs/_confread/_confread.in	2009-06-28 11:21:35.000000000 +0200
-@@ -14,7 +14,7 @@
- #
- # RCSID $Id: _confread.in,v 1.81.2.5 2006/04/12 19:55:42 mcr Exp $
- #
--# 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.15.orig/programs/_confread/ipsec.conf.in openswan-2.4.15/programs/_confread/ipsec.conf.in
---- openswan-2.4.15.orig/programs/_confread/ipsec.conf.in	2006-10-19 05:49:46.000000000 +0200
-+++ openswan-2.4.15/programs/_confread/ipsec.conf.in	2009-06-28 11:22:29.000000000 +0200
-@@ -1,4 +1,4 @@
--# /etc/ipsec.conf - Openswan IPsec configuration file
-+# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file
- # RCSID $Id: ipsec.conf.in,v 1.15.2.6 2006/10/19 03:49:46 paul Exp $
- 
- # This file:  @FINALEXAMPLECONFDIR@/ipsec.conf-sample
-diff -Nru openswan-2.4.15.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.15/programs/examples/l2tp-psk.conf.in
---- openswan-2.4.15.orig/programs/examples/l2tp-psk.conf.in	2007-11-02 02:49:40.000000000 +0100
-+++ openswan-2.4.15/programs/examples/l2tp-psk.conf.in	2009-06-28 11:21:35.000000000 +0200
-@@ -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.15.orig/programs/_include/_include.in openswan-2.4.15/programs/_include/_include.in
---- openswan-2.4.15.orig/programs/_include/_include.in	2003-01-06 22:44:04.000000000 +0100
-+++ openswan-2.4.15/programs/_include/_include.in	2009-06-28 11:21:35.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.15.orig/programs/mailkey/mailkey.in openswan-2.4.15/programs/mailkey/mailkey.in
---- openswan-2.4.15.orig/programs/mailkey/mailkey.in	2006-10-29 01:49:23.000000000 +0200
-+++ openswan-2.4.15/programs/mailkey/mailkey.in	2009-06-28 11:21:35.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.15.orig/programs/Makefile.program openswan-2.4.15/programs/Makefile.program
---- openswan-2.4.15.orig/programs/Makefile.program	2007-06-19 16:49:19.000000000 +0200
-+++ openswan-2.4.15/programs/Makefile.program	2009-06-28 11:21:35.000000000 +0200
-@@ -34,7 +34,6 @@
- WERROR:= -Werror
- endif
- 
--CFLAGS+= ${WERROR}
- 
- ifneq ($(LD_LIBRARY_PATH),)
- LDFLAGS=-L$(LD_LIBRARY_PATH)
-diff -Nru openswan-2.4.15.orig/programs/pluto/Makefile openswan-2.4.15/programs/pluto/Makefile
---- openswan-2.4.15.orig/programs/pluto/Makefile	2007-11-06 19:56:26.000000000 +0100
-+++ openswan-2.4.15/programs/pluto/Makefile	2009-06-28 11:21:35.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)
-diff -Nru openswan-2.4.15.orig/programs/setup/Makefile openswan-2.4.15/programs/setup/Makefile
---- openswan-2.4.15.orig/programs/setup/Makefile	2004-12-18 19:13:43.000000000 +0100
-+++ openswan-2.4.15/programs/setup/Makefile	2009-06-28 11:21:35.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.15.orig/programs/showhostkey/showhostkey.in openswan-2.4.15/programs/showhostkey/showhostkey.in
---- openswan-2.4.15.orig/programs/showhostkey/showhostkey.in	2007-06-19 17:27:27.000000000 +0200
-+++ openswan-2.4.15/programs/showhostkey/showhostkey.in	2009-06-28 11:21:35.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.15.orig/testing/utils/ikeping/Makefile openswan-2.4.15/testing/utils/ikeping/Makefile
---- openswan-2.4.15.orig/testing/utils/ikeping/Makefile	2004-04-03 21:44:52.000000000 +0200
-+++ openswan-2.4.15/testing/utils/ikeping/Makefile	2009-06-28 11:21:35.000000000 +0200
-@@ -27,10 +27,9 @@
- FREESWANINCLS= -I$(FREESWANLIBDIR) -I${OPENSWANSRCDIR}
- FREESWANLIB=$(FREESWANLIBDIR)/libfreeswan.a
- 
--CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
-+CFLAGS = -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
- 	-Wcast-qual -Wmissing-declarations -Wwrite-strings 
- CFLAGS+= -Wstrict-prototypes 
--CFLAGS+= -Werror
- #CFLAGS+= -Wundef
- 
- HDRDIRS =  $(FREESWANINCLS)
diff --git a/net-misc/openswan/files/openswan-2.6.31-gentoo.patch b/net-misc/openswan/files/openswan-2.6.31-gentoo.patch
deleted file mode 100644
index ff064ba1d0db..000000000000
--- a/net-misc/openswan/files/openswan-2.6.31-gentoo.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -Nru openswan-2.6.31.orig/lib/libcrypto/libmd5/Makefile openswan-2.6.31/lib/libcrypto/libmd5/Makefile
---- openswan-2.6.31.orig/lib/libcrypto/libmd5/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/lib/libcrypto/libmd5/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -12,7 +12,7 @@
- 
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
-+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- include ${srcdir}../../Makefile.library
-diff -Nru openswan-2.6.31.orig/lib/libcrypto/libsha1/Makefile openswan-2.6.31/lib/libcrypto/libsha1/Makefile
---- openswan-2.6.31.orig/lib/libcrypto/libsha1/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/lib/libcrypto/libsha1/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -12,7 +12,7 @@
- 
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS  
--CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
-+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- 
-diff -Nru openswan-2.6.31.orig/lib/libcrypto/libsha2/Makefile openswan-2.6.31/lib/libcrypto/libsha2/Makefile
---- openswan-2.6.31.orig/lib/libcrypto/libsha2/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/lib/libcrypto/libsha2/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -15,5 +15,5 @@
- 
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
-+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
- endif
-diff -Nru openswan-2.6.31.orig/lib/libdns/Makefile openswan-2.6.31/lib/libdns/Makefile
---- openswan-2.6.31.orig/lib/libdns/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/lib/libdns/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -31,7 +31,7 @@
- 		-I. -I./include -I${srcdir}include \
- 		-I${srcdir}../libisc/include
- CDEFINES = ${USERCOMPILE} ${PORTINCLUDE}
--CWARNINGS = -Werror
-+CWARNINGS =
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.6.31.orig/lib/libipsecconf/Makefile openswan-2.6.31/lib/libipsecconf/Makefile
---- openswan-2.6.31.orig/lib/libipsecconf/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/lib/libipsecconf/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -33,7 +33,7 @@
- #CFLAGS+=-DFIPS_CHECK
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
-+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- ifeq ($(USE_NM),true)
-diff -Nru openswan-2.6.31.orig/lib/libisc/Makefile openswan-2.6.31/lib/libisc/Makefile
---- openswan-2.6.31.orig/lib/libisc/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/lib/libisc/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -23,7 +23,7 @@
- 		-I. -I./include -I${srcdir}include \
- 		$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include
- CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
--# CWARNINGS = -Werror
-+CWARNINGS =
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.6.31.orig/lib/liblwres/Makefile openswan-2.6.31/lib/liblwres/Makefile
---- openswan-2.6.31.orig/lib/liblwres/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/lib/liblwres/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -23,7 +23,7 @@
- 		-I${srcdir}../libisc/include \
- 		-I. -I./include -I${srcdir}include 
- CDEFINES =
--CWARNINGS = -Werror
-+CWARNINGS =
- 
- CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} 
- 
-diff -Nru openswan-2.6.31.orig/lib/libopenswan/Makefile openswan-2.6.31/lib/libopenswan/Makefile
---- openswan-2.6.31.orig/lib/libopenswan/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/lib/libopenswan/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -100,7 +100,7 @@
- 
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
-+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- ifeq ($(USE_MODP_RFC5114),true)
-diff -Nru openswan-2.6.31.orig/Makefile.inc openswan-2.6.31/Makefile.inc
---- openswan-2.6.31.orig/Makefile.inc	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/Makefile.inc	2010-11-27 13:16:46.000000000 +0100
-@@ -49,7 +49,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*
-diff -Nru openswan-2.6.31.orig/packaging/makefiles/module.make openswan-2.6.31/packaging/makefiles/module.make
---- openswan-2.6.31.orig/packaging/makefiles/module.make	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/packaging/makefiles/module.make	2010-11-27 13:16:46.000000000 +0100
-@@ -25,7 +25,6 @@
- 
- EXTRA_CFLAGS += $(KLIPSCOMPILE)
- EXTRA_CFLAGS += -Wall -DIPCOMP_PREFIX
--#EXTRA_CFLAGS += -Werror
- #EXTRA_CFLAGS += -Wconversion 
- #EXTRA_CFLAGS += -Wmissing-prototypes 
- # 'override CFLAGS' should really be 'EXTRA_CFLAGS'
-diff -Nru openswan-2.6.31.orig/programs/Makefile.program openswan-2.6.31/programs/Makefile.program
---- openswan-2.6.31.orig/programs/Makefile.program	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/programs/Makefile.program	2010-11-27 13:16:46.000000000 +0100
-@@ -48,12 +48,7 @@
- CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFILE}\"
- CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\"
- 
--# die if there are any warnings
--ifndef WERROR
--WERROR:= -Werror
--endif
- 
--CFLAGS+= ${WERROR}
- 
- ifneq ($(LD_LIBRARY_PATH),)
- LDFLAGS=-L$(LD_LIBRARY_PATH)
-@@ -104,8 +99,6 @@
- ifneq ($(NOINSTALL),true)
- 
- doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
--	# remove any old vendor file installed previously
--	@rm -f $(FINALLIBEXECDIR)/vendor
- 	@mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
- 	@if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi
- 	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
-@@ -180,6 +173,7 @@
- LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp
- else
- LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3
-+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
- endif
- 
- 
-diff -Nru openswan-2.6.31.orig/programs/pluto/Makefile.options openswan-2.6.31/programs/pluto/Makefile.options
---- openswan-2.6.31.orig/programs/pluto/Makefile.options	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/programs/pluto/Makefile.options	2010-11-27 13:16:46.000000000 +0100
-@@ -44,7 +44,7 @@
- 
- # -O on Linux makes gcc coredump when compiling sha1.c
- # -Wundef is nice but RHL5.2 compiler doesn't support it
--CFLAGS +=-g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
-+CFLAGS +=-Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
- 	-Wcast-qual -Wmissing-declarations -Wwrite-strings \
- 	-Wstrict-prototypes # -Wundef
- 
-@@ -54,7 +54,7 @@
- 
- # Use LIBNSS
- ifeq ($(USE_LIBNSS),true)
--HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3	
-+HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss	
- endif
- 
- # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN
-@@ -306,6 +306,7 @@
- DEFINES+=-DHAVE_LIBNSS
- LIBSPLUTO+= -lnspr4
- LIBSPLUTO+= -lnss3
-+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
- # For avoiding implicit DSO linking
- LIBSPLUTO+= -lpthread
- ifeq ($(USE_FIPSCHECK),true)
-diff -Nru openswan-2.6.31.orig/programs/rsasigkey/Makefile openswan-2.6.31/programs/rsasigkey/Makefile
---- openswan-2.6.31.orig/programs/rsasigkey/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/programs/rsasigkey/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -21,13 +21,14 @@
- FIPS_CHECK=1
- CFLAGS+=-DFIPS_CHECK
- endif
--INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
-+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- PROGRAM=rsasigkey
- LIBS=${OPENSWANLIB} -lgmp
- ifeq ($(USE_LIBNSS),true)
- LIBS+= -lnspr4 -lnss3 -lplc4
-+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
- ifeq ($(USE_FIPSCHECK),true)
- LIBS+=  -lfipscheck
- endif
-diff -Nru openswan-2.6.31.orig/programs/setup/Makefile openswan-2.6.31/programs/setup/Makefile
---- openswan-2.6.31.orig/programs/setup/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/programs/setup/Makefile	2010-11-27 13:17:15.000000000 +0100
-@@ -16,11 +16,7 @@
- OPENSWANSRCDIR?=$(shell cd ../..; pwd)
- include ${OPENSWANSRCDIR}/Makefile.inc
- 
--# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
--# not as /etc/rc.d/init.d/setup.
--PROGRAMDIR=$(RCDIR)
- PROGRAM=setup
--NOINSTALL=true
- EXTRA8MAN=setup.8
- 
- include ${srcdir}../Makefile.program
-@@ -34,13 +30,11 @@
- 	# remove any old vendor file installed previously
- 	@rm -f $(BINDIR)/setup
- 	# check the directories we need exist (ie., make install DESTDIR=/tmp/IPsec)
--	@mkdir -p $(RCDIR) $(BINDIR)
-+	@mkdir -p $(BINDIR)
- 	# install and link everything
--	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
--	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
-+	@$(INSTALL) $(INSTBINFLAGS) setup $(BINDIR)/setup
- 
- install_file_list::
--	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
- 
- cleanall::
-diff -Nru openswan-2.6.31.orig/programs/showhostkey/Makefile openswan-2.6.31/programs/showhostkey/Makefile
---- openswan-2.6.31.orig/programs/showhostkey/Makefile	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/programs/showhostkey/Makefile	2010-11-27 13:16:46.000000000 +0100
-@@ -16,7 +16,7 @@
- include ${OPENSWANSRCDIR}/Makefile.inc
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
-+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- PROGRAM=showhostkey
-diff -Nru openswan-2.6.31.orig/testing/utils/make-uml.sh openswan-2.6.31/testing/utils/make-uml.sh
---- openswan-2.6.31.orig/testing/utils/make-uml.sh	2010-10-18 18:13:36.000000000 +0200
-+++ openswan-2.6.31/testing/utils/make-uml.sh	2010-11-27 13:16:46.000000000 +0100
-@@ -262,7 +262,7 @@
- 
- cd $OPENSWANSRCDIR || exit 1
- 
--make WERROR=-Werror USE_OBJDIR=true programs
-+make USE_OBJDIR=true programs
- 
- # now, execute the Makefile that we have created!
- cd $POOLSPACE && make $OPENSWANHOSTS 
diff --git a/net-misc/openswan/files/openswan-2.6.37-gentoo.patch b/net-misc/openswan/files/openswan-2.6.37-gentoo.patch
deleted file mode 100644
index 1ff87c35d12a..000000000000
--- a/net-misc/openswan/files/openswan-2.6.37-gentoo.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -Nru openswan-2.6.37.old//lib/libcrypto/libmd5/Makefile openswan-2.6.37/lib/libcrypto/libmd5/Makefile
---- openswan-2.6.37.old//lib/libcrypto/libmd5/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/lib/libcrypto/libmd5/Makefile	2011-11-07 21:36:27.000000000 +0100
-@@ -12,7 +12,7 @@
- 
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
-+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- include ${srcdir}../../Makefile.library
-diff -Nru openswan-2.6.37.old//lib/libcrypto/libsha1/Makefile openswan-2.6.37/lib/libcrypto/libsha1/Makefile
---- openswan-2.6.37.old//lib/libcrypto/libsha1/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/lib/libcrypto/libsha1/Makefile	2011-11-07 21:36:29.000000000 +0100
-@@ -12,7 +12,7 @@
- 
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS  
--CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
-+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- 
-diff -Nru openswan-2.6.37.old//lib/libcrypto/libsha2/Makefile openswan-2.6.37/lib/libcrypto/libsha2/Makefile
---- openswan-2.6.37.old//lib/libcrypto/libsha2/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/lib/libcrypto/libsha2/Makefile	2011-11-07 21:36:30.000000000 +0100
-@@ -15,5 +15,5 @@
- 
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
-+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
- endif
-diff -Nru openswan-2.6.37.old//lib/libdns/Makefile openswan-2.6.37/lib/libdns/Makefile
---- openswan-2.6.37.old//lib/libdns/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/lib/libdns/Makefile	2011-11-07 21:36:30.000000000 +0100
-@@ -31,7 +31,7 @@
- 		-I. -I./include -I${srcdir}include \
- 		-I${srcdir}../libisc/include
- CDEFINES = ${USERCOMPILE} ${PORTINCLUDE}
--CWARNINGS = -Werror
-+CWARNINGS =
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.6.37.old//lib/libipsecconf/Makefile openswan-2.6.37/lib/libipsecconf/Makefile
---- openswan-2.6.37.old//lib/libipsecconf/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/lib/libipsecconf/Makefile	2011-11-07 21:36:32.000000000 +0100
-@@ -33,7 +33,7 @@
- #CFLAGS+=-DFIPS_CHECK
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
-+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- ifeq ($(USE_NM),true)
-diff -Nru openswan-2.6.37.old//lib/libisc/Makefile openswan-2.6.37/lib/libisc/Makefile
---- openswan-2.6.37.old//lib/libisc/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/lib/libisc/Makefile	2011-11-07 21:36:32.000000000 +0100
-@@ -23,7 +23,7 @@
- 		-I. -I./include -I${srcdir}include \
- 		$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include
- CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
--# CWARNINGS = -Werror
-+CWARNINGS =
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.6.37.old//lib/liblwres/Makefile openswan-2.6.37/lib/liblwres/Makefile
---- openswan-2.6.37.old//lib/liblwres/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/lib/liblwres/Makefile	2011-11-07 21:36:32.000000000 +0100
-@@ -23,7 +23,7 @@
- 		-I${srcdir}../libisc/include \
- 		-I. -I./include -I${srcdir}include 
- CDEFINES =
--CWARNINGS = -Werror
-+CWARNINGS =
- 
- CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} 
- 
-diff -Nru openswan-2.6.37.old//lib/libopenswan/Makefile openswan-2.6.37/lib/libopenswan/Makefile
---- openswan-2.6.37.old//lib/libopenswan/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/lib/libopenswan/Makefile	2011-11-07 21:36:32.000000000 +0100
-@@ -105,7 +105,7 @@
- 
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
-+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- ifeq ($(USE_MODP_RFC5114),true)
-diff -Nru openswan-2.6.37.old//Makefile.inc openswan-2.6.37/Makefile.inc
---- openswan-2.6.37.old//Makefile.inc	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/Makefile.inc	2011-11-07 21:36:32.000000000 +0100
-@@ -55,7 +55,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*
-diff -Nru openswan-2.6.37.old//packaging/makefiles/module.make openswan-2.6.37/packaging/makefiles/module.make
---- openswan-2.6.37.old//packaging/makefiles/module.make	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/packaging/makefiles/module.make	2011-11-07 21:36:35.000000000 +0100
-@@ -25,7 +25,6 @@
- 
- EXTRA_CFLAGS += $(KLIPSCOMPILE)
- EXTRA_CFLAGS += -Wall -DIPCOMP_PREFIX
--#EXTRA_CFLAGS += -Werror
- #EXTRA_CFLAGS += -Wconversion 
- #EXTRA_CFLAGS += -Wmissing-prototypes 
- # 'override CFLAGS' should really be 'EXTRA_CFLAGS'
-diff -Nru openswan-2.6.37.old//programs/Makefile.program openswan-2.6.37/programs/Makefile.program
---- openswan-2.6.37.old//programs/Makefile.program	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/programs/Makefile.program	2011-11-07 21:36:36.000000000 +0100
-@@ -48,12 +48,7 @@
- CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFILE}\"
- CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\"
- 
--# die if there are any warnings
--ifndef WERROR
--WERROR:= -Werror
--endif
- 
--CFLAGS+= ${WERROR}
- 
- ifneq ($(LD_LIBRARY_PATH),)
- LDFLAGS=-L$(LD_LIBRARY_PATH)
-@@ -104,8 +99,6 @@
- ifneq ($(NOINSTALL),true)
- 
- doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
--	# remove any old vendor file installed previously
--	@rm -f $(FINALLIBEXECDIR)/vendor
- 	@mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
- 	@if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi
- 	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
-@@ -180,6 +173,7 @@
- LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp
- else
- LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3
-+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
- endif
- 
- 
-diff -Nru openswan-2.6.37.old//programs/pluto/Makefile.options openswan-2.6.37/programs/pluto/Makefile.options
---- openswan-2.6.37.old//programs/pluto/Makefile.options	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/programs/pluto/Makefile.options	2011-11-07 21:36:36.000000000 +0100
-@@ -44,7 +44,7 @@
- 
- # -O on Linux makes gcc coredump when compiling sha1.c
- # -Wundef is nice but RHL5.2 compiler doesn't support it
--CFLAGS +=-g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
-+CFLAGS +=-Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
- 	-Wcast-qual -Wmissing-declarations -Wwrite-strings \
- 	-Wstrict-prototypes # -Wundef
- 
-@@ -58,7 +58,7 @@
- 
- # Use LIBNSS
- ifeq ($(USE_LIBNSS),true)
--HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3	
-+HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss	
- endif
- 
- # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN
-@@ -315,6 +315,7 @@
- DEFINES+=-DHAVE_LIBNSS
- LIBSPLUTO+= -lnspr4
- LIBSPLUTO+= -lnss3
-+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
- # For avoiding implicit DSO linking
- LIBSPLUTO+= -lpthread
- ifeq ($(USE_FIPSCHECK),true)
-diff -Nru openswan-2.6.37.old//programs/rsasigkey/Makefile openswan-2.6.37/programs/rsasigkey/Makefile
---- openswan-2.6.37.old//programs/rsasigkey/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/programs/rsasigkey/Makefile	2011-11-07 21:36:36.000000000 +0100
-@@ -21,13 +21,14 @@
- FIPS_CHECK=1
- CFLAGS+=-DFIPS_CHECK
- endif
--INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
-+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- PROGRAM=rsasigkey
- LIBS=${OPENSWANLIB} -lgmp
- ifeq ($(USE_LIBNSS),true)
- LIBS+= -lnspr4 -lnss3 -lplc4
-+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
- ifeq ($(USE_FIPSCHECK),true)
- LIBS+=  -lfipscheck
- endif
-diff -Nru openswan-2.6.37.old//programs/setup/Makefile openswan-2.6.37/programs/setup/Makefile
---- openswan-2.6.37.old//programs/setup/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/programs/setup/Makefile	2011-11-07 21:36:36.000000000 +0100
-@@ -16,11 +16,7 @@
- OPENSWANSRCDIR?=$(shell cd ../..; pwd)
- include ${OPENSWANSRCDIR}/Makefile.inc
- 
--# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
--# not as /etc/rc.d/init.d/setup.
--PROGRAMDIR=$(RCDIR)
- PROGRAM=setup
--NOINSTALL=true
- EXTRA8MAN=setup.8
- 
- include ${srcdir}../Makefile.program
-@@ -34,13 +30,11 @@
- 	# remove any old vendor file installed previously
- 	@rm -f $(BINDIR)/setup
- 	# check the directories we need exist (ie., make install DESTDIR=/tmp/IPsec)
--	@mkdir -p $(RCDIR) $(BINDIR)
-+	@mkdir -p $(BINDIR)
- 	# install and link everything
--	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
--	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
-+	@$(INSTALL) $(INSTBINFLAGS) setup $(BINDIR)/setup
- 
- install_file_list::
--	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
- 
- cleanall::
-diff -Nru openswan-2.6.37.old//programs/showhostkey/Makefile openswan-2.6.37/programs/showhostkey/Makefile
---- openswan-2.6.37.old//programs/showhostkey/Makefile	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/programs/showhostkey/Makefile	2011-11-07 21:36:36.000000000 +0100
-@@ -16,7 +16,7 @@
- include ${OPENSWANSRCDIR}/Makefile.inc
- ifeq ($(USE_LIBNSS),true)
- CFLAGS+=-DHAVE_LIBNSS
--INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
-+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
- endif
- 
- PROGRAM=showhostkey
-diff -Nru openswan-2.6.37.old//testing/utils/make-uml.sh openswan-2.6.37/testing/utils/make-uml.sh
---- openswan-2.6.37.old//testing/utils/make-uml.sh	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/testing/utils/make-uml.sh	2011-11-07 21:39:58.000000000 +0100
-@@ -264,7 +264,7 @@
- 
- cd $OPENSWANSRCDIR || exit 1
- 
--make ${WERROR:-WERROR=-Werror} USE_OBJDIR=true USE_IPSECPOLICY=true programs
-+make ${WERROR:-WERROR=} USE_OBJDIR=true USE_IPSECPOLICY=true programs
- 
- # now, execute the Makefile that we have created!
- cd $POOLSPACE && make $OPENSWANHOSTS 
diff --git a/net-misc/openswan/openswan-2.4.15-r2.ebuild b/net-misc/openswan/openswan-2.4.15-r2.ebuild
deleted file mode 100644
index a75bd9c50380..000000000000
--- a/net-misc/openswan/openswan-2.4.15-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.15-r2.ebuild,v 1.3 2011/06/06 06:18:52 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils linux-info toolchain-funcs
-
-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 ms-bad-proposal"
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	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 -ge 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_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
-	use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch
-
-	find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \
-	    -e 's:/usr/local:/usr:g' \
-	    -e 's:/etc/ipsec[\][&][.]conf:/etc/ipsec/ipsec\\\&.conf:g' \
-	    -e 's:/etc/ipsec[.]conf:/etc/ipsec/ipsec.conf:g' \
-	    -e 's:/etc/ipsec[\][&][.]secrets:/etc/ipsec/ipsec\\\&.secrets:g' \
-	    -e 's:/etc/ipsec[.]secrets:/etc/ipsec/ipsec.secrets:g' '{}' \; ||
-	    die "failed to replace text in docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALCONFDIR=/etc/ipsec \
-		FINALCONFFILE=/etc/ipsec/ipsec.conf \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${PF} \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\" \
-		CC=\"$(tc-getCC)\"
-	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"
-
-	dodoc docs/{KNOWN_BUGS,RELEASE-NOTES*,debugging*}
-	dodoc doc/*.html
-	docinto quickstarts
-	dodoc doc/quickstarts/*
-
-	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 -ge 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.6.31.ebuild b/net-misc/openswan/openswan-2.6.31.ebuild
deleted file mode 100644
index 8203dc698bd6..000000000000
--- a/net-misc/openswan/openswan-2.6.31.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.31.ebuild,v 1.2 2011/06/06 06:18:52 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils linux-info toolchain-funcs flag-o-matic
-
-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="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss"
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	dev-lang/perl
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	nss? ( dev-libs/nss )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.1.2" # see bug 237132
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	if use nocrypto-algorithms && ! use weak-algorithms; then
-		ewarn "Enabling nocrypto-algorithms USE flag has no effect when"
-		ewarn "weak-algorithms USE flag is disabled"
-	fi
-
-	linux-info_pkg_setup
-
-	if kernel_is -ge 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
-
-	# most code is OK, but programs/pluto code breaks strict aliasing
-	append-cflags -fno-strict-aliasing
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch
-
-	find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \
-	    -e s:/usr/local:/usr:g '{}' \; ||
-	    die "failed to replace text in docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\"\
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF}\
-		INC_RCDEFAULT=/etc/init.d\
-		INC_USRLOCAL=/usr\
-		INC_MANDIR=share/man\
-		FINALDOCDIR=/usr/share/doc/${PF}/html\
-		FINALLIBDIR=/usr/$(get_libdir)/ipsec\
-		DESTDIR=\"${D}\"\
-		USERCOMPILE=\"${CFLAGS}\"\
-		CC=\"$(tc-getCC)\"
-
-	use caps\
-		&& echo USE_LIBCAP_NG=true\
-		|| echo USE_LIBCAP_NG=false
-
-	use curl\
-		&& echo USE_LIBCURL=true\
-		|| echo USE_LIBCURL=false
-
-	use ldap\
-		&& echo USE_LDAP=true\
-		|| echo USE_LDAP=false
-
-	echo USE_XAUTH=true
-	use pam\
-		&& echo USE_XAUTHPAM=true\
-		|| echo USE_XAUTHPAM=false
-
-	use nss\
-		&& echo USE_LIBNSS=true\
-		|| echo USE_LIBNSS=false
-
-	use ssl\
-		&& echo HAVE_OPENSSL=true\
-		|| echo HAVE_OPENSSL=false
-
-	use extra-algorithms\
-		&& echo USE_EXTRACRYPTO=true\
-		|| echo USE_EXTRACRYPTO=false
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-		if use nocrypto-algorithms; then
-			echo USE_NOCRYPTO=true
-		fi
-	else
-		echo USE_WEAKSTUFF=false
-	fi
-
-	echo USE_LWRES=false # needs bind9 with lwres support
-	if use curl || use ldap || use pam; then
-		echo HAVE_THREADS=true
-	else
-		echo HAVE_THREADS=false
-	fi
-}
-
-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"
-
-	dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*}
-	dohtml doc/*.html
-	docinto quickstarts
-	dodoc doc/quickstarts/*
-
-	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
-
-	keepdir /var/run/pluto
-}
-
-pkg_preinst() {
-	if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then
-		ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':"
-		local i err=0
-		if [ -h "../ipsec.d" ]; then
-			rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink"
-		fi
-		for i in *; do
-			if [ -e "../$i" ]; then
-				eerror "  $i NOT MOVED, ../$i already exists!"
-				err=1
-			elif [ -d "$i" ]; then
-				mv "$i" .. || die "failed to move $i directory"
-				ewarn "  directory $i"
-			elif [ -f "$i" ]; then
-				sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \
-					mv "$i" .. && ewarn "  file $i" || \
-					die "failed to move $i file"
-			else
-				eerror "  $i NOT MOVED, it is not a file nor a directory!"
-				err=1
-			fi
-		done
-		popd
-		if [ $err -eq 0 ]; then
-			rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec"
-		else
-			ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if kernel_is -ge 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.6.37-r1.ebuild b/net-misc/openswan/openswan-2.6.37-r1.ebuild
deleted file mode 100644
index 1f3922a6bee1..000000000000
--- a/net-misc/openswan/openswan-2.6.37-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.37-r1.ebuild,v 1.1 2011/11/21 20:51:51 vapier Exp $
-
-EAPI="2"
-
-inherit eutils linux-info toolchain-funcs flag-o-matic
-
-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="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss"
-
-RESTRICT="test" # requires user mode linux setup
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	dev-lang/perl
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	nss? ( dev-libs/nss )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.1.2" # see bug 237132
-RDEPEND="${COMMON_DEPEND}
-	|| ( sys-apps/net-tools[old-output] <sys-apps/net-tools-1.60_p201111202031570500 )
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	if use nocrypto-algorithms && ! use weak-algorithms; then
-		ewarn "Enabling nocrypto-algorithms USE flag has no effect when"
-		ewarn "weak-algorithms USE flag is disabled"
-	fi
-
-	linux-info_pkg_setup
-
-	if kernel_is -ge 2 6; then
-		einfo "This ebuild will set ${P} to use kernel native IPsec (KAME)."
-		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
-
-	# most code is OK, but programs/pluto code breaks strict aliasing
-	append-cflags -fno-strict-aliasing
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch
-
-	find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \
-	    -e s:/usr/local:/usr:g '{}' \; ||
-	    die "failed to replace text in docs"
-}
-
-usetf() { usex $1 true false ; }
-get_make_options() {
-	make_options=(
-		KERNELSRC="${KERNEL_DIR}"
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-		INC_RCDEFAULT=/etc/init.d
-		INC_USRLOCAL=/usr
-		INC_MANDIR=share/man
-		FINALDOCDIR=/usr/share/doc/${PF}/html
-		FINALLIBDIR=/usr/$(get_libdir)/ipsec
-		DESTDIR="${D}"
-		USERCOMPILE="${CFLAGS}"
-		USERLINK="-Wl,-z,relro ${LDFLAGS}"
-		CC="$(tc-getCC)"
-		USE_LIBCAP_NG=$(usetf caps)
-		USE_LIBCURL=$(usetf curl)
-		USE_LDAP=$(usetf ldap)
-		USE_XAUTH=true
-		USE_XAUTHPAM=$(usetf pam)
-		USE_LIBNSS=$(usetf nss)
-		HAVE_OPENSSL=$(usetf ssl)
-		USE_EXTRACRYPTO=$(usetf extra-algorithms)
-		USE_WEAKSTUFF=$(usetf weak-algorithms)
-	)
-
-	if use weak-algorithms && use nocrypto-algorithms ; then
-		make_options+=( USE_NOCRYPTO=true )
-	fi
-
-	make_options+=( USE_LWRES=false ) # needs bind9 with lwres support
-	if use curl || use ldap || use pam; then
-		make_options+=( HAVE_THREADS=true )
-	else
-		make_options+=( HAVE_THREADS=false )
-	fi
-}
-
-src_compile() {
-	local make_options; get_make_options
-	emake "${make_options[@]}" ${MYMAKE} || die
-}
-
-src_install() {
-	local make_options; get_make_options
-	emake "${make_options[@]}" install || die
-
-	dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*}
-	docinto quickstarts
-	dodoc docs/quickstarts/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r contrib
-
-	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
-
-	keepdir /var/run/pluto
-}
-
-pkg_preinst() {
-	if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then
-		ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':"
-		local i err=0
-		if [ -h "../ipsec.d" ]; then
-			rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink"
-		fi
-		for i in *; do
-			if [ -e "../$i" ]; then
-				eerror "  $i NOT MOVED, ../$i already exists!"
-				err=1
-			elif [ -d "$i" ]; then
-				mv "$i" .. || die "failed to move $i directory"
-				ewarn "  directory $i"
-			elif [ -f "$i" ]; then
-				sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \
-					mv "$i" .. && ewarn "  file $i" || \
-					die "failed to move $i file"
-			else
-				eerror "  $i NOT MOVED, it is not a file nor a directory!"
-				err=1
-			fi
-		done
-		popd
-		if [ $err -eq 0 ]; then
-			rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec"
-		else
-			ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if kernel_is -ge 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.6.37.ebuild b/net-misc/openswan/openswan-2.6.37.ebuild
deleted file mode 100644
index 2330083e4a73..000000000000
--- a/net-misc/openswan/openswan-2.6.37.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.37.ebuild,v 1.3 2011/11/10 14:32:21 chainsaw Exp $
-
-EAPI="2"
-
-inherit eutils linux-info toolchain-funcs flag-o-matic
-
-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="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss"
-
-RESTRICT="test" # requires user mode linux setup
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	dev-lang/perl
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	nss? ( dev-libs/nss )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.1.2" # see bug 237132
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	if use nocrypto-algorithms && ! use weak-algorithms; then
-		ewarn "Enabling nocrypto-algorithms USE flag has no effect when"
-		ewarn "weak-algorithms USE flag is disabled"
-	fi
-
-	linux-info_pkg_setup
-
-	if kernel_is -ge 2 6; then
-		einfo "This ebuild will set ${P} to use kernel native IPsec (KAME)."
-		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
-
-	# most code is OK, but programs/pluto code breaks strict aliasing
-	append-cflags -fno-strict-aliasing
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch
-
-	find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \
-	    -e s:/usr/local:/usr:g '{}' \; ||
-	    die "failed to replace text in docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\"\
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF}\
-		INC_RCDEFAULT=/etc/init.d\
-		INC_USRLOCAL=/usr\
-		INC_MANDIR=share/man\
-		FINALDOCDIR=/usr/share/doc/${PF}/html\
-		FINALLIBDIR=/usr/$(get_libdir)/ipsec\
-		DESTDIR=\"${D}\"\
-		USERCOMPILE=\"${CFLAGS}\"\
-		USERLINK=\"-Wl,-z,relro ${LDFLAGS}\"\
-		CC=\"$(tc-getCC)\"
-
-	use caps\
-		&& echo USE_LIBCAP_NG=true\
-		|| echo USE_LIBCAP_NG=false
-
-	use curl\
-		&& echo USE_LIBCURL=true\
-		|| echo USE_LIBCURL=false
-
-	use ldap\
-		&& echo USE_LDAP=true\
-		|| echo USE_LDAP=false
-
-	echo USE_XAUTH=true
-	use pam\
-		&& echo USE_XAUTHPAM=true\
-		|| echo USE_XAUTHPAM=false
-
-	use nss\
-		&& echo USE_LIBNSS=true\
-		|| echo USE_LIBNSS=false
-
-	use ssl\
-		&& echo HAVE_OPENSSL=true\
-		|| echo HAVE_OPENSSL=false
-
-	use extra-algorithms\
-		&& echo USE_EXTRACRYPTO=true\
-		|| echo USE_EXTRACRYPTO=false
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-		if use nocrypto-algorithms; then
-			echo USE_NOCRYPTO=true
-		fi
-	else
-		echo USE_WEAKSTUFF=false
-	fi
-
-	echo USE_LWRES=false # needs bind9 with lwres support
-	if use curl || use ldap || use pam; then
-		echo HAVE_THREADS=true
-	else
-		echo HAVE_THREADS=false
-	fi
-}
-
-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"
-
-	dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*}
-	docinto quickstarts
-	dodoc docs/quickstarts/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r contrib
-
-	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
-
-	keepdir /var/run/pluto
-}
-
-pkg_preinst() {
-	if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then
-		ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':"
-		local i err=0
-		if [ -h "../ipsec.d" ]; then
-			rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink"
-		fi
-		for i in *; do
-			if [ -e "../$i" ]; then
-				eerror "  $i NOT MOVED, ../$i already exists!"
-				err=1
-			elif [ -d "$i" ]; then
-				mv "$i" .. || die "failed to move $i directory"
-				ewarn "  directory $i"
-			elif [ -f "$i" ]; then
-				sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \
-					mv "$i" .. && ewarn "  file $i" || \
-					die "failed to move $i file"
-			else
-				eerror "  $i NOT MOVED, it is not a file nor a directory!"
-				err=1
-			fi
-		done
-		popd
-		if [ $err -eq 0 ]; then
-			rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec"
-		else
-			ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if kernel_is -ge 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.6.38.ebuild b/net-misc/openswan/openswan-2.6.38.ebuild
index e71bae510a2b..0f9653fcc048 100644
--- a/net-misc/openswan/openswan-2.6.38.ebuild
+++ b/net-misc/openswan/openswan-2.6.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.38.ebuild,v 1.3 2012/09/14 22:29:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.38.ebuild,v 1.4 2012/12/27 15:24:03 floppym Exp $
 
 EAPI="4"
 
@@ -130,8 +130,6 @@ src_install() {
 	docompress -x /usr/share/doc/${PF}/contrib
 
 	newinitd "${FILESDIR}"/ipsec-initd ipsec
-
-	keepdir /var/run/pluto
 }
 
 pkg_preinst() {