Use KV_DIR instead of relying on the /lib/modules build symlink pointing to the source, which is broken behaviour.

Package-Manager: portage-2.1.5.4

3 files changed, 29 insertions, 17 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index e7fdd1225d2b..2f38bf193aa4 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/ipsec-tools
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.59 2008/03/13 11:23:52 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.60 2008/06/06 23:53:31 swegener Exp $
+
+  06 Jun 2008; Sven Wegener <swegener@gentoo.org> ipsec-tools-0.6.7.ebuild:
+  Use KV_DIR instead of relying on the /lib/modules build symlink pointing
+  to the source, which is broken behaviour.
 
   13 Mar 2008; Wolfram Schlich <wschlich@gentoo.org>
   ipsec-tools-0.6.7.ebuild:
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 15e811b7fab2..4ce40282080d 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX racoon.conf.d 621 RMD160 773a21f70bd4786eb6758f052bb54cc40273c259 SHA1 1291dbe1639cbb72a161e3af727c9c65c6ae0132 SHA256 bc7cf9c0fe8bd5f99c9353aa3c19e3314b3da21a7a2138fc6e901375be21b109
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 DIST ipsec-tools-0.6.5.tar.bz2 665244 RMD160 ae26866d1b703eaf3c2d9dca50113e94163d57ac SHA1 3663d9c0f77c7c8607d1ce5cfddadd955d07a612 SHA256 12dee73accd5be0c2389133b397507f0725fa503b81e65a5eb52e871f4c21369
 DIST ipsec-tools-0.6.7.tar.bz2 723032 RMD160 97c27922f5be941fd6c69e35e69bed921b9f13e7 SHA1 ed3a6566409c506d5a7cd82cf263a5b8df3fad55 SHA256 4239f836dc610a2443ded7ba35cb3b87de9d582c800e5d9eb5eed37defd61ef2
 EBUILD ipsec-tools-0.6.5.ebuild 1702 RMD160 bafc61b156b205481f99a07d7052901f6ff51a66 SHA1 db08cbafb3cb0f9f21e2162f26548b1100880389 SHA256 34ee6e846cd18e26f777c6bb40baecd71ebe85575819431118ab3cfe4f110bb6
-EBUILD ipsec-tools-0.6.7.ebuild 8386 RMD160 dfaf75392ce40d98ee9c1201f428f734bdb9cdbc SHA1 6d47e12dc965141b51d31a65cd447e6ce187502c SHA256 e1879592a99be968b51600696c7e84c8d4813130ee446d11efc4d292ac5e5f64
-MISC ChangeLog 9738 RMD160 aeabd091ba137861ee69c727093a0753e2ea66c9 SHA1 d47d243af9e084d2287c1aabad6ba28690de3323 SHA256 e118173278ffd2b784a850a97ca23a45fbf4012ed0d7c65c9378f6a2fd936c83
+EBUILD ipsec-tools-0.6.7.ebuild 8292 RMD160 858e01df1a89602ebd7bdec89248817b0793bd10 SHA1 17532d5fe99d32258872f0ec664dfa8a68d5479e SHA256 4412ca3d2c4ce34e4838f9be4b5bc7a0fe81bd49d84b2bbd7163638a3c3d6e89
+MISC ChangeLog 9934 RMD160 9348afeeea232a6dbd6c63f0461a43e47ad44789 SHA1 64643633fd88b5ecde6c45332671052bbc09250d SHA256 a715ab66f5488570c5cbe18a43c4036d4a676ef2e8058697685ada97c15d56c8
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFISc4EI1lqEGTUzyQRAnhSAJwIv3yaSEIXG89DS4eul9ND7zUGJgCeK+2p
++4T5Svgrkz94C8kRWk+ogqU=
+=yIrn
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.6.7.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.6.7.ebuild
index cd7eae6b6103..205aca849c7f 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.6.7.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.6.7.ebuild,v 1.12 2008/03/13 11:23:52 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.6.7.ebuild,v 1.13 2008/06/06 23:53:31 swegener Exp $
 
 inherit eutils flag-o-matic autotools linux-info
 
@@ -141,11 +141,11 @@ kernel_check() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# fix for bug #76741
 	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c
 	# fix for bug #124813
-	sed -i 's:-Werror::g' ${S}/configure.ac
+	sed -i 's:-Werror::g' "${S}"/configure.ac
 
 	AT_M4DIR="${S}" eautoreconf
 	epunt_cxx
@@ -157,7 +157,7 @@ src_compile() {
 
 	kernel_check
 
-	myconf="${myconf} --with-kernel-headers=/lib/modules/${KV_FULL}/build/include"
+	myconf="${myconf} --with-kernel-headers=${KV_DIR}/include"
 
 	use nat && myconf="${myconf} --enable-natt --enable-natt-versions=yes"
 #	myconf="${myconf} $(use_enable broken-natt)"
@@ -197,8 +197,7 @@ src_compile() {
 	#myconf="${myconf} --enable-samode-unspec"
 
 	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" # parallel make is still broken
-	emake || die
+	emake -j1 || die
 
 }
 
@@ -232,33 +231,32 @@ src_install() {
 
 pkg_postinst() {
 	if use nat; then
-		elog ""
+		elog
 		elog " You have enabled the nat traversal functionnality."
 		elog " Nat versions wich are enabled by default are 00,02,rfc"
 		elog " you can find those drafts in the CVS repository:"
 		elog "cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co ipsec-tools"
-		elog ""
+		elog
 		elog "If you feel brave enough and you know what you are"
 		elog "doing, you can consider emerging this ebuild"
 		elog "with"
 		elog "EXTRA_ECONF=\"--enable-natt-versions=08,07,06\""
-		elog ""
+		elog
 	fi;
 
 	if use ldap; then
-		elog ""
+		elog
 		elog " You have enabled ldap support with {$PN}."
 		elog " The man page does NOT contain any information on it yet."
 		elog " Consider to use a more recent version or CVS"
-		elog ""
+		elog
 	fi;
 
-	elog ""
+	elog
 	elog "Please have a look in /usr/share/doc/${P} and visit"
 	elog "http://www.netbsd.org/Documentation/network/ipsec/"
 	elog "to find a lot of information on how to configure this great tool."
-	elog ""
-
+	elog
 }
 
 # vim: set foldmethod=marker nowrap :