Mark version 2.4.15-r2 as stable on amd64 and x86. Version bump (#301813).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

9 files changed, 346 insertions, 476 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 5e0a58c38879..0aa2e45c7fb9 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/openswan
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.72 2009/12/15 14:49:44 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.73 2010/08/15 20:45:47 mrness Exp $
+
+*openswan-2.6.28 (15 Aug 2010)
+
+  15 Aug 2010; Alin Năstac <mrness@gentoo.org> -openswan-2.4.15-r1.ebuild,
+  openswan-2.4.15-r2.ebuild, -openswan-2.6.23-r1.ebuild,
+  -openswan-2.6.23-r2.ebuild, -files/openswan-2.6.23-gentoo.patch,
+  +openswan-2.6.28.ebuild, +files/openswan-2.6.28-gentoo.patch,
+  metadata.xml:
+  Mark version 2.4.15-r2 as stable on amd64 and x86. Version bump (#301813).
 
   15 Dec 2009; Peter Volkov <pva@gentoo.org> metadata.xml:
   metadata.xml: added required herd tag.
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index ac385f90e90c..fe6021279f4e 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,16 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a613a025d34ea3b68e95c2b13e62c SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21
 AUX ipsec-initd 487 RMD160 23d9d7be6000fb95fdb142bc948964d6050b7864 SHA1 55a4c3ab2523f265e314c9048c0552699564fc4d SHA256 e86140b6e596a0b0d6e52ca521adb891eb3b9cc4ad8e6f28041fb773f9f60347
 AUX openswan-2.4-allow-ms-bad-proposal.patch 481 RMD160 7ad11a9fa18a633554fc52d8d45c4513e4436f89 SHA1 3f714737c3e731cc6a62ab8c7b51948ea9c7a566 SHA256 30cc482b9cd3b47699a94c77c7ac16c047913a55d7c66d11e60ea213db84f39d
 AUX openswan-2.4.15-deprecated-ldap.patch 372 RMD160 434d98f24c6b0066be3ce6d50e679b67edc22791 SHA1 95b8aec3807d953d9af3ca7ddc67b6aa08d340db SHA256 e891c8daa25dd8a06b6cc070cdc9913f260c375cf7a794b496a430e029e660bc
 AUX openswan-2.4.15-gentoo.patch 7744 RMD160 fb3d0f745ddf93f11fbeeee98d709c46455c248d SHA1 14dc6577ddb6e52a7356407512725a23865d02b8 SHA256 792055fe57e1a7756d5e804bdbbdf76e009b9b4e60141125bd92c464ec46d946
 AUX openswan-2.6-allow-ms-bad-proposal.patch 551 RMD160 3fda2ba360cb5d3427af56c12f32526c78465c7e SHA1 6649779a6ae76773c78db5d646927a7e698ce825 SHA256 3c84444f6181c0b7f7749c828db790e20f637d93d9dacec8e120709cce8adcc0
-AUX openswan-2.6.23-gentoo.patch 5343 RMD160 ac3faa214214b4c2b9c55ebb24b01e97a1b13b6d SHA1 9430bd651aef246b427c7b0e453cb81e2a53a399 SHA256 cc3048ad2540a92a504aa58de3f7bed28a022eb59dc0a32be7b593f151c7e671
+AUX openswan-2.6.28-gentoo.patch 9996 RMD160 f615854748fa9c9cd8634dc18d2bda260b0ec027 SHA1 24b37b29a8fccf6a5bae85597becbb1e16fed6e9 SHA256 c8402b7523845cc676071fd35aeec18ec10f1de725e42ea8512ce0c164ac9801
 DIST openswan-2.4.15.tar.gz 3938290 RMD160 be0c9bec423f5df5815d6a773ed79c4d832b94a9 SHA1 b9b76c81fae2ff1f202c362fc67518a7acd1e99e SHA256 cf85bf896dd2b0b0818d2851f4d8ec61f816f777d47cbfed7065a682ffd47293
-DIST openswan-2.6.23.tar.gz 8127086 RMD160 534e5be9df46116db65adf17e05faae13c8c5f8d SHA1 03ce952f4a7fe6be8c8244d759d782d2249d010f SHA256 5e14092746ebca6c8f6ec03e98c74c8094d5343a4f20f860f8cf15f3d33261e2
-EBUILD openswan-2.4.15-r1.ebuild 3788 RMD160 0195c1c269a763347e5ce2ba96cc7aa16a0a80de SHA1 21df0773a8f788161ba364a387277a28630e9ea2 SHA256 6b9e1ab34d6de2ca89680d207f94eda8dfbdec36cd75f57a8f5b3af98a9c3806
-EBUILD openswan-2.4.15-r2.ebuild 3943 RMD160 8e3a1d37c06fd7c5e557104f8e0473600cf06d3d SHA1 619093dd89ed2f71f8c9cfe10426277c0ca95dfa SHA256 817e33688996bb72a744239f5db7b62a93cfdde24c6069dbb21218d25f43fa41
+DIST openswan-2.6.28.tar.gz 11668960 RMD160 f763b84d98681529e9bb31e6a7216cbff6e84792 SHA1 bc6706d9070292c069bcea2f568e4467d8540194 SHA256 888810f35ea460f0548840aa59588b814e839b28ddc50b364cf454edd446961a
+EBUILD openswan-2.4.15-r2.ebuild 3941 RMD160 34796df57c4a31a3f86fda644ce2103e9cd4f803 SHA1 b7f4b4be76a8c5c916a88f2a3cf26b889a82fc68 SHA256 5f489fcb810835ed3e20adb29e6d1b6a10413e6ff5561605a432e63447ad15ee
 EBUILD openswan-2.4.15.ebuild 3524 RMD160 846041fd08d5f29d85ae4721ec8941cb32662d5e SHA1 b51b0f8072555e2c4216751625d8d690251d74a4 SHA256 da2aab48d0493e800a4ad6d0bdd913a736e7e0aa8035b7ec2f06e33539568cb7
-EBUILD openswan-2.6.23-r1.ebuild 4650 RMD160 fe9138f2a63d2a5bd1ba5069b0f16adae47174b7 SHA1 5749cf596ac51f4719d0806bb806c288abfa5536 SHA256 081f1bd8b19df3184591fb75973f1068c4130c2f4d934f4bc65e426f964d5595
-EBUILD openswan-2.6.23-r2.ebuild 4816 RMD160 2ea46ed4979808e2ed1727e0da65e705f2e9bac2 SHA1 2fe671054bb8adb27708466c524d04cc670e516d SHA256 9aed3b49286688067c64c202e6c15db2e84b41222d79e25237dec166afe681a4
-MISC ChangeLog 14450 RMD160 ac5132bd92e0abe36de92c6797c797f1c3fcbefd SHA1 be1e2e1130e39d92afa7756f63761229ad80a768 SHA256 ab065ac1ca9c0c1ce4cd3f788a53385faa69e73f0c4df67ac4236fbb8387dcca
-MISC metadata.xml 1192 RMD160 ac97277aecf2f6b2a46c9855d7e03cc28d4d12a4 SHA1 6e64e698b87beff77059c384086ed707994501a2 SHA256 c50a9610dc6598c6e2e954b2c93ce9bf0ea1b63edd3a4c35d8defc877406f7f3
+EBUILD openswan-2.6.28.ebuild 5243 RMD160 177e381a12d9a26021b2b37f5cb91e50195b4c03 SHA1 c875a16373320c3a33ce43758d1b5be1325b2038 SHA256 180ffd22e7ed6f9feb8d85190ee9e694dbe02bc74b8cba6d0c5474a2a74ccd6d
+MISC ChangeLog 14843 RMD160 9e616937fc7fe4557d7d18fe4ce21e68ef1c6709 SHA1 f060073745559384d7896b2f97f545a7f563b0d9 SHA256 a34a3849e2956e0ce3c6d369bb6d31f8ac8d1a8f673458f4b7de46ea63a0303a
+MISC metadata.xml 1337 RMD160 3611ffb76802ca7b6861f0270516797855fc8b42 SHA1 3302ad08d5eaeae76ea442961a098be0c0f1ca3b SHA256 2ff2ae007cebac56757fb8cd302d72181461d7056d9045810ee05250439c6545
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkxoUgYACgkQ1564UogppBJXVwCgiPydwdI3WWFb94fo4SyLW5LX
+GNsAoLmqo7Ve3jfVvbJ26E6z6f6gX5JL
+=rDDu
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.6.23-gentoo.patch b/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
deleted file mode 100644
index df5a5ce67f1c..000000000000
--- a/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Nru openswan-2.6.23.orig/lib/libdns/Makefile openswan-2.6.23/lib/libdns/Makefile
---- openswan-2.6.23.orig/lib/libdns/Makefile	2009-09-09 02:42:54.000000000 +0200
-+++ openswan-2.6.23/lib/libdns/Makefile	2009-09-11 19:20:37.000000000 +0200
-@@ -30,8 +30,8 @@
- 		-I${srcdir}../libisc/nothreads/include \
- 		-I. -I./include -I${srcdir}include \
- 		-I${srcdir}../libisc/include
--CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE}
--CWARNINGS = -Werror
-+CDEFINES = ${USERCOMPILE} ${PORTINCLUDE}
-+CWARNINGS = 
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.6.23.orig/lib/libisc/Makefile openswan-2.6.23/lib/libisc/Makefile
---- openswan-2.6.23.orig/lib/libisc/Makefile	2009-09-09 02:42:54.000000000 +0200
-+++ openswan-2.6.23/lib/libisc/Makefile	2009-09-11 19:20:37.000000000 +0200
-@@ -22,8 +22,8 @@
- 		-I${srcdir}nothreads/include \
- 		-I. -I./include -I${srcdir}include \
- 		$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include
--CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
--# CWARNINGS = -Werror
-+CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
-+# CWARNINGS = 
- 
- CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
- 
-diff -Nru openswan-2.6.23.orig/lib/liblwres/Makefile openswan-2.6.23/lib/liblwres/Makefile
---- openswan-2.6.23.orig/lib/liblwres/Makefile	2009-09-09 02:42:54.000000000 +0200
-+++ openswan-2.6.23/lib/liblwres/Makefile	2009-09-11 19:20:37.000000000 +0200
-@@ -22,8 +22,8 @@
- 		-I${srcdir}../libisc/${ISCARCH}/include \
- 		-I${srcdir}../libisc/include \
- 		-I. -I./include -I${srcdir}include 
--CDEFINES = -g
--CWARNINGS = -Werror
-+CDEFINES = 
-+CWARNINGS = 
- 
- CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} 
- 
-diff -Nru openswan-2.6.23.orig/Makefile.inc openswan-2.6.23/Makefile.inc
---- openswan-2.6.23.orig/Makefile.inc	2009-09-09 02:42:54.000000000 +0200
-+++ openswan-2.6.23/Makefile.inc	2009-09-11 19:20:37.000000000 +0200
-@@ -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*
-@@ -94,7 +94,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.6.23.orig/programs/Makefile.program openswan-2.6.23/programs/Makefile.program
---- openswan-2.6.23.orig/programs/Makefile.program	2009-09-09 02:42:54.000000000 +0200
-+++ openswan-2.6.23/programs/Makefile.program	2009-09-11 19:20:37.000000000 +0200
-@@ -53,7 +53,6 @@
- WERROR:= -Werror
- endif
- 
--CFLAGS+= ${WERROR}
- 
- ifneq ($(LD_LIBRARY_PATH),)
- LDFLAGS=-L$(LD_LIBRARY_PATH)
-diff -Nru openswan-2.6.23.orig/programs/setup/Makefile openswan-2.6.23/programs/setup/Makefile
---- openswan-2.6.23.orig/programs/setup/Makefile	2009-09-09 02:42:54.000000000 +0200
-+++ openswan-2.6.23/programs/setup/Makefile	2009-09-11 19:21:55.000000000 +0200
-@@ -18,7 +18,6 @@
- 
- # 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=
-+PROGRAM=setup
- EXTRA8MAN=setup.8
- 
-@@ -29,32 +28,6 @@
- # into the $BINDIR.
- #
- # the priorities match those in setup's chkconfig line
--doinstall:: setup
--	@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
--
--cleanall::
--	@rm -f setup
- 
- #
- # $Log: not supported by cvs2svn $
- # Revision 1.1  2009/09/11 18:46:35  mrness
- # Version bump.
- # Correct ipsec.conf and ipsec.secrets paths in openswan-2.4 documentation (#284235).
- # Add ms-bad-proposal USE flag and patch (#284240).
- # (Portage version: 2.1.6.13/cvs/Linux x86_64)
- #
-diff -Nru openswan-2.6.23.orig/testing/utils/make-uml.sh openswan-2.6.23/testing/utils/make-uml.sh
---- openswan-2.6.23.orig/testing/utils/make-uml.sh	2009-09-09 02:42:54.000000000 +0200
-+++ openswan-2.6.23/testing/utils/make-uml.sh	2009-09-11 19:20:37.000000000 +0200
-@@ -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.28-gentoo.patch b/net-misc/openswan/files/openswan-2.6.28-gentoo.patch
new file mode 100644
index 000000000000..98ad1053c438
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6.28-gentoo.patch
@@ -0,0 +1,256 @@
+diff -Nru openswan-2.6.28.orig/lib/libcrypto/libmd5/Makefile openswan-2.6.28/lib/libcrypto/libmd5/Makefile
+--- openswan-2.6.28.orig/lib/libcrypto/libmd5/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libcrypto/libmd5/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -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.28.orig/lib/libcrypto/libsha1/Makefile openswan-2.6.28/lib/libcrypto/libsha1/Makefile
+--- openswan-2.6.28.orig/lib/libcrypto/libsha1/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libcrypto/libsha1/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -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.28.orig/lib/libcrypto/libsha2/Makefile openswan-2.6.28/lib/libcrypto/libsha2/Makefile
+--- openswan-2.6.28.orig/lib/libcrypto/libsha2/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libcrypto/libsha2/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -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.28.orig/lib/libdns/Makefile openswan-2.6.28/lib/libdns/Makefile
+--- openswan-2.6.28.orig/lib/libdns/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libdns/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -30,8 +30,8 @@
+ 		-I${srcdir}../libisc/nothreads/include \
+ 		-I. -I./include -I${srcdir}include \
+ 		-I${srcdir}../libisc/include
+-CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE}
+-CWARNINGS = -Werror
++CDEFINES = ${USERCOMPILE} ${PORTINCLUDE}
++CWARNINGS = 
+ 
+ CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
+ 
+diff -Nru openswan-2.6.28.orig/lib/libipsecconf/Makefile openswan-2.6.28/lib/libipsecconf/Makefile
+--- openswan-2.6.28.orig/lib/libipsecconf/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libipsecconf/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -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.28.orig/lib/libisc/Makefile openswan-2.6.28/lib/libisc/Makefile
+--- openswan-2.6.28.orig/lib/libisc/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libisc/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -22,8 +22,8 @@
+ 		-I${srcdir}nothreads/include \
+ 		-I. -I./include -I${srcdir}include \
+ 		$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include
+-CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
+-# CWARNINGS = -Werror
++CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
++# CWARNINGS = 
+ 
+ CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
+ 
+diff -Nru openswan-2.6.28.orig/lib/liblwres/Makefile openswan-2.6.28/lib/liblwres/Makefile
+--- openswan-2.6.28.orig/lib/liblwres/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/liblwres/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -22,8 +22,8 @@
+ 		-I${srcdir}../libisc/${ISCARCH}/include \
+ 		-I${srcdir}../libisc/include \
+ 		-I. -I./include -I${srcdir}include 
+-CDEFINES = -g
+-CWARNINGS = -Werror
++CDEFINES = 
++CWARNINGS = 
+ 
+ CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} 
+ 
+diff -Nru openswan-2.6.28.orig/lib/libopenswan/Makefile openswan-2.6.28/lib/libopenswan/Makefile
+--- openswan-2.6.28.orig/lib/libopenswan/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libopenswan/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -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.28.orig/Makefile.inc openswan-2.6.28/Makefile.inc
+--- openswan-2.6.28.orig/Makefile.inc	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/Makefile.inc	2010-08-15 17:47:57.000000000 +0200
+@@ -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*
+@@ -94,7 +94,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.6.28.orig/programs/Makefile.program openswan-2.6.28/programs/Makefile.program
+--- openswan-2.6.28.orig/programs/Makefile.program	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/Makefile.program	2010-08-15 17:47:57.000000000 +0200
+@@ -53,7 +53,6 @@
+ WERROR:= -Werror
+ endif
+ 
+-CFLAGS+= ${WERROR}
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+ LDFLAGS=-L$(LD_LIBRARY_PATH)
+@@ -104,8 +103,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 +177,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.28.orig/programs/pluto/Makefile.options openswan-2.6.28/programs/pluto/Makefile.options
+--- openswan-2.6.28.orig/programs/pluto/Makefile.options	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/pluto/Makefile.options	2010-08-15 17:48:34.000000000 +0200
+@@ -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
+@@ -309,6 +309,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.28.orig/programs/rsasigkey/Makefile openswan-2.6.28/programs/rsasigkey/Makefile
+--- openswan-2.6.28.orig/programs/rsasigkey/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/rsasigkey/Makefile	2010-08-15 17:48:55.000000000 +0200
+@@ -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.28.orig/programs/setup/Makefile openswan-2.6.28/programs/setup/Makefile
+--- openswan-2.6.28.orig/programs/setup/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/setup/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -18,8 +18,7 @@
+ 
+ # 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=
++PROGRAM=setup
+ EXTRA8MAN=setup.8
+ 
+ include ${srcdir}../Makefile.program
+@@ -29,30 +28,4 @@
+ # into the $BINDIR.
+ #
+ # the priorities match those in setup's chkconfig line
+-doinstall:: setup
+-	@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
+-
+-cleanall::
+-	@rm -f setup
+ 
+diff -Nru openswan-2.6.28.orig/programs/showhostkey/Makefile openswan-2.6.28/programs/showhostkey/Makefile
+--- openswan-2.6.28.orig/programs/showhostkey/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/showhostkey/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -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.28.orig/testing/utils/make-uml.sh openswan-2.6.28/testing/utils/make-uml.sh
+--- openswan-2.6.28.orig/testing/utils/make-uml.sh	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/testing/utils/make-uml.sh	2010-08-15 17:47:57.000000000 +0200
+@@ -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/metadata.xml b/net-misc/openswan/metadata.xml
index 20e74f4f5162..b7cbea834212 100644
--- a/net-misc/openswan/metadata.xml
+++ b/net-misc/openswan/metadata.xml
@@ -21,5 +21,7 @@ growing frustrated with the politics surrounding the FreeS/WAN project.</longdes
     (1DES)</flag>
     <flag name="ms-bad-proposal">Allow bad IP address proposal offered by an
     Microsoft L2TP/IPSec servers</flag>
+    <flag name="nss">Include libnss support (adds smartcard support)</flag>
+    <flag name="ssl">Use OpenSSL libraries for BIGNUM support</flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/openswan/openswan-2.4.15-r1.ebuild b/net-misc/openswan/openswan-2.4.15-r1.ebuild
deleted file mode 100644
index aa5b0343dd0a..000000000000
--- a/net-misc/openswan/openswan-2.4.15-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/09/11 18:46:36 mrness Exp $
-
-EAPI="2"
-
-inherit eutils linux-info
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-HOMEPAGE="http://www.openswan.org/"
-SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms 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 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}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-	fi
-	echo USE_OE=false # by default, turn off Opportunistic Encryption
-	echo USE_LWRES=false # needs bind9 with lwres support
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
-	fi
-	echo HAVE_THREADS=${USETHREADS}
-}
-
-src_compile() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
-}
-
-src_install() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
-
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	doinitd "${FILESDIR}"/ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
-}
-
-pkg_postinst() {
-	if kernel_is 2 6; then
-		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
-		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
-		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
-		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
-		check_extra_config
-	fi
-}
diff --git a/net-misc/openswan/openswan-2.4.15-r2.ebuild b/net-misc/openswan/openswan-2.4.15-r2.ebuild
index 57ee6154656e..5e6613557170 100644
--- a/net-misc/openswan/openswan-2.4.15-r2.ebuild
+++ b/net-misc/openswan/openswan-2.4.15-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.1 2009/12/05 08:01:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.15-r2.ebuild,v 1.2 2010/08/15 20:45:47 mrness Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="curl ldap smartcard extra-algorithms weak-algorithms ms-bad-proposal"
 
 COMMON_DEPEND="!net-misc/strongswan
diff --git a/net-misc/openswan/openswan-2.6.23-r1.ebuild b/net-misc/openswan/openswan-2.6.23-r1.ebuild
deleted file mode 100644
index cb45d304ee6d..000000000000
--- a/net-misc/openswan/openswan-2.6.23-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.23-r1.ebuild,v 1.1 2009/09/17 16:07:06 mrness Exp $
-
-EAPI="2"
-
-inherit eutils linux-info
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-HOMEPAGE="http://www.openswan.org/"
-SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms nocrypto-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
-	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 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
-	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 \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	else
-		echo USE_EXTRACRYPTO=false
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-		if use nocrypto-algorithms; then
-			echo USE_NOCRYPTO=true
-		fi
-	fi
-	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"
-
-	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /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 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.23-r2.ebuild b/net-misc/openswan/openswan-2.6.28.ebuild
index 355bfc24e41f..fa65a5d23f75 100644
--- a/net-misc/openswan/openswan-2.6.23-r2.ebuild
+++ b/net-misc/openswan/openswan-2.6.28.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.23-r2.ebuild,v 1.1 2009/12/05 08:01:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.28.ebuild,v 1.1 2010/08/15 20:45:47 mrness Exp $
 
 EAPI="2"
 
-inherit eutils linux-info toolchain-funcs
+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/"
@@ -13,14 +13,16 @@ 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 nocrypto-algorithms ms-bad-proposal"
+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
-	smartcard? ( dev-libs/opensc )
+	caps? ( sys-libs/libcap-ng )
 	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
+	ldap? ( net-nds/openldap )
+	nss? ( dev-libs/nss )
+	ssl? ( dev-libs/openssl )"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
 	app-text/xmlto
@@ -56,6 +58,9 @@ pkg_setup() {
 	else
 		die "Unsupported kernel version"
 	fi
+
+	# most code is OK, but programs/pluto code breaks strict aliasing
+	append-cflags -fno-strict-aliasing
 }
 
 src_prepare() {
@@ -68,52 +73,69 @@ src_prepare() {
 }
 
 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 \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\" \
+	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\
+		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
-	else
-		echo USE_EXTRACRYPTO=false
-	fi
+
+	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
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
+	if use curl || use ldap || use pam; then
+		echo HAVE_THREADS=true
+	else
+		echo HAVE_THREADS=false
 	fi
-	echo HAVE_THREADS=${USETHREADS}
 }
 
 src_compile() {
 	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
+	emake "$@" ${MYMAKE} || die "emake failed"
 }
 
 src_install() {
 	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
+	emake "$@" install || die "emake install failed"
 
 	dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*}
 	dohtml doc/*.html
@@ -122,7 +144,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
 
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
+	keepdir /var/run/pluto
 }
 
 pkg_preinst() {