Remove /var/run/pluto after the build system creates it, bug 448834.

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

3 files changed, 15 insertions, 9 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index a87870d89663..6805aa908336 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,9 @@
 # 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.86 2012/12/27 15:24:03 floppym Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.87 2013/01/06 17:54:29 floppym Exp $
+
+  06 Jan 2013; Mike Gilbert <floppym@gentoo.org> openswan-2.6.38.ebuild:
+  Remove /var/run/pluto after the build system creates it, bug 448834.
 
   27 Dec 2012; Mike Gilbert <floppym@gentoo.org> -files/ipsec,
   -files/openswan-2.4-allow-ms-bad-proposal.patch,
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index f93812f8324f..fd3aebc64e12 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -5,13 +5,13 @@ AUX ipsec-initd 487 SHA256 e86140b6e596a0b0d6e52ca521adb891eb3b9cc4ad8e6f28041fb
 AUX openswan-2.6-allow-ms-bad-proposal.patch 551 SHA256 3c84444f6181c0b7f7749c828db790e20f637d93d9dacec8e120709cce8adcc0 SHA512 9a41f6d8e7cce99d96ff11ea5a50288831a3e30c5cb0b5be5f21dcd3d09f7c0968f78235693408f18b80a651e9d86955446106bc775213ad159ae6b6a830b407 WHIRLPOOL dbc025dd6bd4249e99f18bb0d6ae52e14ac5a6bd7de7de81147acd4d65985ee24eb18e4fdf4f9e2ae4e54af817940a940b5561a65a65c28dc1ecb2ef759f4005
 AUX openswan-2.6.38-gentoo.patch 9913 SHA256 b1f12f7cb0da2db047e7a21b2895d9a7b1562f426af111853e1c13141e7c874b SHA512 829668e4693fd822097c549b0d1829c6b92ae4ec0ad1a04944fa34d79eec03168560166df8272930c397517a68aa350f42dc3d2c74982e0c17338f2a23d6e218 WHIRLPOOL 5af74c3e1c2fb05b14b3e046fab8245bfe5ba5be8eae28d52482fbd86556b2612e8cb0371822d207b3e2f08e0223675e212092dc7690920b5a9f16fa8eaf057e
 DIST openswan-2.6.38.tar.gz 10861574 SHA256 bdd3ccf31df1f3e8530887986ea8b6702a3db139486738213f5de8d8690b3723 SHA512 0963a9df548c901eb562185f97d844f57539668f11fbe2a43712223773053895c761b1d5d0be4fffa64014baf58ff2d7cf23676a3da51c5a5134b0639796ad10 WHIRLPOOL e270de7eceee7964148910ed4ec35a39df002ebca3ca892d9f13a2a06eaf1476019c5ac8830eb24c9389afb8256d43ea580d7a3d29dc828be88608a9535d9668
-EBUILD openswan-2.6.38.ebuild 5208 SHA256 3d26aa4327ee904c90a45b1ec963614df511ab33b4bae53a37753629b3389c9b SHA512 6f14d2cdf467071b2609e592494728e5a30c9108e2610cf52012bd169cb454b3b334cc760d908ee056e62d9d1011cf6926ade3948638767c684727bc61afc729 WHIRLPOOL ed2d370d44c80f1092cbfa62c237a7881ad170e25435d9ba0a0171832aa397936aee87860f24ad87dc98379da15f7d7f28a14cfd73a492a3784f0694e06fda6c
-MISC ChangeLog 17309 SHA256 7b60cbf330c3625d920d24a7665ae63d3e2986c2f966337082f8b84e72af94f6 SHA512 7eae22d717ca87b84eb295876c6914f5e49aa4de686e56e70c317f038b20e816810900a4df60121f2343cc509175f1b8e0dcb88695e2f24aa8cd669cba23f390 WHIRLPOOL 38e6f69ad3290641cecbb372b6f680e398ba57c49c2cf62c1218656a584153fe74bc7aa8794ff0e6cb249e72c3c490c46d21eaf10f3a4f7dd8b272e3fd3d23a0
+EBUILD openswan-2.6.38.ebuild 5278 SHA256 0f583da8e07e1913011a04039800fa8916975adcae47695b25275c5093126f0e SHA512 edef2a56e0a0c198b25d8ba600acc952332d9f59377d0f97fe4335169f4d3fff76b5ef46eb3c7689f6b14f3e9d1d89df17b22f072706b861bcb8a98fa7018810 WHIRLPOOL 503f8b73aadcc9b4ee49a8412d54c4289ab04c57ead9fef6c4413246aa79b6c422aa061e5ef7030a0174967b2abccd223dccf803c9f41445159ef7dec7a829ae
+MISC ChangeLog 17454 SHA256 6e6ef47bad7e4d1304b07c2882738a64866626f63e06843ee4044abcb0acee0b SHA512 31df6b4994e621cc00695a9158b4d1c43e88a1acd353dd6f37d2129eb72c5e0e06cee71d42d34bc1eb3760e690a62b37d83efe14a6aad05892e32ffae5b263c6 WHIRLPOOL 566b070e8d0164cf7a592bd13f80fd245746ed842c3e3b62c4ef73c2b88f81dab6ea1bbebf0e5226bcd87bf66a92771fd1d884a17be4049934fd110e5cd8f33b
 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
+iF4EAREIAAYFAlDpulcACgkQC77qH+pIQ6TWygD+MA9hf7bDg6Du25bBqMaxeeYx
+xGep3nrH3QCWVIvKsy8A/ieOLX6xWKpno6zLxNCvWAGgGUhb50tsxIncdYNOBWeP
+=E5KW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/openswan-2.6.38.ebuild b/net-misc/openswan/openswan-2.6.38.ebuild
index 0f9653fcc048..ec079b173650 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
+# Copyright 1999-2013 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.4 2012/12/27 15:24:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.38.ebuild,v 1.5 2013/01/06 17:54:29 floppym Exp $
 
 EAPI="4"
 
@@ -130,6 +130,9 @@ src_install() {
 	docompress -x /usr/share/doc/${PF}/contrib
 
 	newinitd "${FILESDIR}"/ipsec-initd ipsec
+
+	# We don't need to install /var/run/pluto.
+	rm -rf "${D}var" || die
 }
 
 pkg_preinst() {