Use selected CC (#293277). Install more doc files (#294533).

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

5 files changed, 162 insertions, 144 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index a7b141e6986e..ea7aa9399d00 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,14 @@
 # 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.70 2009/09/17 16:07:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.71 2009/12/05 08:01:44 mrness Exp $
+
+*openswan-2.6.23-r2 (05 Dec 2009)
+*openswan-2.4.15-r2 (05 Dec 2009)
+
+  05 Dec 2009; Alin Năstac <mrness@gentoo.org> +openswan-2.4.15-r2.ebuild,
+  -openswan-2.6.22.ebuild, -files/openswan-2.6.22-gentoo.patch,
+  +openswan-2.6.23-r2.ebuild:
+  Use selected CC (#293277). Install more doc files (#294533).
 
 *openswan-2.6.23-r1 (17 Sep 2009)
 
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 80eea36c9cb4..fe3b64c20907 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -7,21 +7,20 @@ AUX openswan-2.4-allow-ms-bad-proposal.patch 481 RMD160 7ad11a9fa18a633554fc52d8
 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.22-gentoo.patch 5088 RMD160 e61921ae0c795e38c44e38f5a22f0881aaf4d893 SHA1 783cee333a0fa0f820c76d7bda808404c650aa39 SHA256 e95a2cd4fa2aff4c1d75951c27595045602180a6865920594b318ec6cd576db8
 AUX openswan-2.6.23-gentoo.patch 5343 RMD160 ac3faa214214b4c2b9c55ebb24b01e97a1b13b6d SHA1 9430bd651aef246b427c7b0e453cb81e2a53a399 SHA256 cc3048ad2540a92a504aa58de3f7bed28a022eb59dc0a32be7b593f151c7e671
 DIST openswan-2.4.15.tar.gz 3938290 RMD160 be0c9bec423f5df5815d6a773ed79c4d832b94a9 SHA1 b9b76c81fae2ff1f202c362fc67518a7acd1e99e SHA256 cf85bf896dd2b0b0818d2851f4d8ec61f816f777d47cbfed7065a682ffd47293
-DIST openswan-2.6.22.tar.gz 8152865 RMD160 dd06dbf7147407c9dc31efa29253d4c06ef5f0b1 SHA1 44cc5d6dd850b926f9addfd88ec2540984b08563 SHA256 05f4db569206b2bb31d99a322eb75a4830567e2859f485a12fdbaee37d91704b
 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
 EBUILD openswan-2.4.15.ebuild 3524 RMD160 846041fd08d5f29d85ae4721ec8941cb32662d5e SHA1 b51b0f8072555e2c4216751625d8d690251d74a4 SHA256 da2aab48d0493e800a4ad6d0bdd913a736e7e0aa8035b7ec2f06e33539568cb7
-EBUILD openswan-2.6.22.ebuild 4532 RMD160 bf55872849421ca354554c99f1cb5be66dee203e SHA1 d0ca8b86fc9b92d26ecc9b8e704bf855f994f969 SHA256 71a90ba5379c7dd3892a00759552c6e02e39fe2b03f9ab27aafa408df980e1ba
 EBUILD openswan-2.6.23-r1.ebuild 4650 RMD160 fe9138f2a63d2a5bd1ba5069b0f16adae47174b7 SHA1 5749cf596ac51f4719d0806bb806c288abfa5536 SHA256 081f1bd8b19df3184591fb75973f1068c4130c2f4d934f4bc65e426f964d5595
-MISC ChangeLog 14049 RMD160 78b6e24475ac594d40f02430ca57fc580a668d5b SHA1 a1e3c89bbe75f4f4000ca3195bfcb1b0aa516ca2 SHA256 9c3bcd68123d90d6ee92f1218953907d4c9011f4b516f566b6db95abf37f7cf8
+EBUILD openswan-2.6.23-r2.ebuild 4816 RMD160 2ea46ed4979808e2ed1727e0da65e705f2e9bac2 SHA1 2fe671054bb8adb27708466c524d04cc670e516d SHA256 9aed3b49286688067c64c202e6c15db2e84b41222d79e25237dec166afe681a4
+MISC ChangeLog 14352 RMD160 fc80167028799f911499d31ddab0672aa36754dc SHA1 e615a2ec8f76d7173fc24f1c9dd0645e7fb4631b SHA256 55b64dfddd2894c9ac13357b36262741e0045f859473fbf81edda27c02926730
 MISC metadata.xml 1169 RMD160 972a171b3ac79de89b5885a0ec41e067930e7c72 SHA1 648e25d425288f8b7b160cce0d26fd33a7d9e133 SHA256 3b481978833bd6bf1eac2a07930dc3b1ea622cc7abd2dcdb2bbae47d65672a3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqyXr0ACgkQ9A5kJBGSrssdEACgpY896sxeWQ71rWJ6Lu/fpYDV
-KGIAn1gQZWXL81s1TTrgWGa0gqhAVFVQ
-=YyGi
+iEYEARECAAYFAksaE7cACgkQ9A5kJBGSrssWSACfQDAjneQPTEGRMyC+ByMISTHu
+IOAAnRNyfUmLtSah47Fstl9GFxnTo4eD
+=IPTz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.6.22-gentoo.patch b/net-misc/openswan/files/openswan-2.6.22-gentoo.patch
deleted file mode 100644
index cf163b5ad351..000000000000
--- a/net-misc/openswan/files/openswan-2.6.22-gentoo.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Nru openswan-2.6.22.orig/lib/libdns/Makefile openswan-2.6.22/lib/libdns/Makefile
---- openswan-2.6.22.orig/lib/libdns/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/lib/libdns/Makefile	2009-06-24 18:54:55.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.22.orig/lib/libisc/Makefile openswan-2.6.22/lib/libisc/Makefile
---- openswan-2.6.22.orig/lib/libisc/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/lib/libisc/Makefile	2009-06-24 18:54:55.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.22.orig/lib/liblwres/Makefile openswan-2.6.22/lib/liblwres/Makefile
---- openswan-2.6.22.orig/lib/liblwres/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/lib/liblwres/Makefile	2009-06-24 18:54:55.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.22.orig/Makefile.inc openswan-2.6.22/Makefile.inc
---- openswan-2.6.22.orig/Makefile.inc	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/Makefile.inc	2009-06-24 18:54:55.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.22.orig/programs/Makefile.program openswan-2.6.22/programs/Makefile.program
---- openswan-2.6.22.orig/programs/Makefile.program	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/programs/Makefile.program	2009-06-24 18:54:55.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.22.orig/programs/setup/Makefile openswan-2.6.22/programs/setup/Makefile
---- openswan-2.6.22.orig/programs/setup/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/programs/setup/Makefile	2009-06-24 18:54: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=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 $
-diff -Nru openswan-2.6.22.orig/testing/utils/make-uml.sh openswan-2.6.22/testing/utils/make-uml.sh
---- openswan-2.6.22.orig/testing/utils/make-uml.sh	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/testing/utils/make-uml.sh	2009-06-24 18:54:55.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/openswan-2.4.15-r2.ebuild b/net-misc/openswan/openswan-2.4.15-r2.ebuild
new file mode 100644
index 000000000000..57ee6154656e
--- /dev/null
+++ b/net-misc/openswan/openswan-2.4.15-r2.ebuild
@@ -0,0 +1,134 @@
+# 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-r2.ebuild,v 1.1 2009/12/05 08:01:44 mrness 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 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 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.22.ebuild b/net-misc/openswan/openswan-2.6.23-r2.ebuild
index 333b30aad621..355bfc24e41f 100644
--- a/net-misc/openswan/openswan-2.6.22.ebuild
+++ b/net-misc/openswan/openswan-2.6.23-r2.ebuild
@@ -1,10 +1,10 @@
 # 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.22.ebuild,v 1.2 2009/06/28 09:45:59 mrness Exp $
+# $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 $
 
 EAPI="2"
 
-inherit eutils linux-info
+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/"
@@ -13,7 +13,7 @@ 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"
+IUSE="curl ldap smartcard extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal"
 
 COMMON_DEPEND="!net-misc/strongswan
 	dev-libs/gmp
@@ -60,10 +60,11 @@ pkg_setup() {
 
 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]' -exec sed -i \
+	find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \
 	    -e s:/usr/local:/usr:g '{}' \; ||
-	    die "failed to replace text in xml docs"
+	    die "failed to replace text in docs"
 }
 
 get_make_options() {
@@ -74,7 +75,8 @@ get_make_options() {
 		INC_MANDIR=share/man \
 		FINALDOCDIR=/usr/share/doc/${PF}/html \
 		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
+		USERCOMPILE=\"${CFLAGS}\" \
+		CC=\"$(tc-getCC)\"
 	if use smartcard ; then
 		echo USE_SMARTCARD=true
 	fi
@@ -113,6 +115,11 @@ src_install() {
 	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"
 
 	dodir /var/run/pluto || die "failed to create /var/run/pluto"