Do not install /var/lib or /var/lock paths as the code will take care of creating it at runtime.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 26 insertions, 8 deletions

diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index 973c3d1bb595..32fcee7f547b 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/opencryptoki
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.25 2013/05/10 16:03:33 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.26 2013/12/01 06:13:50 vapier Exp $
+
+  01 Dec 2013; Mike Frysinger <vapier@gentoo.org> opencryptoki-2.4.3.ebuild:
+  Do not install /var/lib or /var/lock paths as the code will take care of
+  creating it at runtime.
 
 *opencryptoki-2.4.3 (10 May 2013)
 
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index c219808e5211..f65b4eb332a6 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -9,13 +9,23 @@ DIST opencryptoki-2.4.2.tar.gz 1083876 SHA256 0bfbcf956fec078af12c34cd447c6274a5
 DIST opencryptoki-2.4.3.tar.gz 1111897 SHA256 3ddc0a0e96957e64e61a960c8a7bfcff0030564ebf4f6848abe0740491fd52bc SHA512 e33d8df344161909c1fc0626880d89e47ac902c5f780cc04af07691fff20c50bdea5bfa0368df39fff84b365342f704638e90b329a3ae12ab5fb5f668c50a164 WHIRLPOOL ab5836f30749e7bb56b1ba882c15098096d7c36e1f9dd65a83a93d9b497231258a54c5a60cf4847fce8267c086a3aea380c33380fcb9d7a20c770f5f922846d7
 EBUILD opencryptoki-2.3.3-r5.ebuild 3627 SHA256 d7ebe5f519375f3789137e241851f96116ae6ecc374807dc07b87e9f72343930 SHA512 dd323fb20bf486ecbd6e7de5db56fbfc286aae7aa30bda2017bd8ecd4df01d4da32138707fe4c84898d2911cc1c45957c14bd25985c1322d7571caeded2cd261 WHIRLPOOL 231cf8ce9e22c2e09455465692f8b53dc356c34dbcf1f8a4aecf6df892b821d788575d27d171a17e29d3a9ae91cafe728b1f361365db846c113d0bb5900d312d
 EBUILD opencryptoki-2.4.2.ebuild 3236 SHA256 9a9b779cf84668ddaf6838f8cf1bcf30d42c0a81163fb84abdd0e122e3350c8c SHA512 6fccc3fccc918c51c18a0c6b0727b5d76f4d926c8b6296a81fd6eb98af0a514826ae92edc7318cf19351127507fc52582fc3201a541e87f3674435e9878109e0 WHIRLPOOL 828925560acaec77ff58dcd0d015e474fdcd00d39b527279f8d35a6a5aa4a794c08843cc7ebecc50ab6c59e773d30f87eba0dd7974f74e515c48b425049583d3
-EBUILD opencryptoki-2.4.3.ebuild 3188 SHA256 d492cce6a739f4ce9a97753443530d25878a726077e684cac1825f404c65f2f3 SHA512 0018d7bb4f930ea1419130df4309b1037118b3c27b628041965e8725b978d512db721da1a0e92a127099d71bede277ed66075c3a97eb2d510dca02aceffcf533 WHIRLPOOL f58217bdea148c01e516a6316a3705d13ac78e0973ae4fa54be4f04b965f8b2f6b6c89f0a23e86322eff016f85f9c9e5205f33a9208715634a97927908376b43
-MISC ChangeLog 5366 SHA256 d15e72b3cecc313dac3dccf1e1858f2664f8fa5bf87eea7255673b08c468991d SHA512 35effcd586728c8146109a3feef310b5404a89a71d4cc5c33d5a1361734141d9e502c47c50414d472ef215490e306235b39236796fe42f6548d2fd8cef5ef75a WHIRLPOOL 343790091bf5abe5d3ad74a508e89c9d5204dd174a8a094168831aeb158026bcf5cf8cb2eea0ec62e85948df490d891daba1440cdd3b22161211414b1e430276
+EBUILD opencryptoki-2.4.3.ebuild 3309 SHA256 c48d52be1117c2c47852d7287b3929e45f5d547da7e0636d379c70e5ef0a1eb5 SHA512 b173c0e4cdaf0826b13b700710979dd953890269fb1b0a30a9ad5de56d589b07046ffbcd24952a54de6fd79d8491810171ff20ab503cda531d64b628f50e3656 WHIRLPOOL 4701468fb8c75084960cf0152a83e79bf818ffab93d36474f87397b06117eb5e8021efb5fa54385aa5bb9effe347ea8c7ecc1884f5c93b59956b306530b00d7d
+MISC ChangeLog 5545 SHA256 6be5e9d8b8f5f6505f62dcc0bad393116143f9389a88fa9871ec8f172e69a7ef SHA512 f1b8f10937c76db5c3013f9f6c742f5220fd56b0e37b400a2a857bb15ae74f52689fa14fbbe719791ef6609f7c11e09f93aad6b12ff33dcadb28e4a6338ce306 WHIRLPOOL ea342c2112fee9b872149b5389881ab8d40c9a7384e129e7bbe68e67ff7eb1a4aa910f7475b64a858170a0edead3b0c575d16f42967e6f4474a3385f2f6bb781
 MISC metadata.xml 303 SHA256 6f37596c4a13d63dcbfe0b13494aacf994e803dbdf3190d1545f9fd8b355cead SHA512 0baa0b541224eb841eb8e768fb8972e40d8d6791451f9396c4897ffbf1e593de6c626b8b90517400288476bb2fca22f8a6cf1410a6e5468255139b27249f7d80 WHIRLPOOL b5e72ed8ea3c1b04d47257a6b39f04d41da4a5afc25ab2138c62946d5ef28908821af559020cb933d1fd725661bb3f297f153ada45485beb2dd195e1c5b99d0e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlGNGlkACgkQXYk9GL8g3FG5lAD+IeO+Ys19YTC89KTPK0lGGwW9
-jWqP6obpVbUSYhN9+LoBAJuZQzfcdRoTaDR6P2WakaRPj2orJGXMvGr02nyPta26
-=R4ne
+iQIcBAEBCAAGBQJSmtOmAAoJELEHsLL7fEFWiLAQAIRYUrMEqAiwP1awIZ/yvFvX
+rHWJh2zF3j4Z56jJxUFhHmuGqfbhEbF0qeHX0Wvgiq/VNjgtEwetb/AcByk9WRjU
+c0HZni44CXoMP1FsLTGoUxA8iVDd7MLBcnXbjNkx/iPz6E+GJCM2hNXFCjpPDzC+
+NOecLRWGDPOz0syEfLKY+QYrKtrNWoA0yVy0WkJF7AyoRbuKSLfYRcGhtTsIfgnk
+sf+Hemy6KupLdk/ASle4HqNhM6v2/cEO+xRELfaOp38Wq435Vl9QorYZhtvoZsK2
+kQB2RyI5rQrUN+rtPbR8aVQdvt/uqDT+QWzhYuA9LzOX3k7jGiJXwfja/VQbjI7M
+zLCuZmWnB3M6kRI6HXYWvno4uTCWshq95KgRppu7TWd1PZ1dA9LIoBden1dJg4pa
+J87hTDAhHSLBhMyus8rVQQATfcIbmueaTi3X5FH+spwZFBXGfGXPXFhH7vaJ+8B8
+kuHmgJzWENJcyQoC/i5z9sDOZwUOLSDi7kz8FLI05Xkl28kRrYAH37tPhLk9oUPg
+B1TRiNgKwMjdwcdxfqnxIWx2A30unCN+XgnNcwGkgOFMjlawss8dxv7qbyjrNxr3
+/MxrEMX1sehG72MjhIosh5QVnPiYP4OFWd8OdhwaebhiTndwNOPsn6mM7/xAQ/vW
+gUj3LpUmqhljwO7d0Rq7
+=+6GQ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild b/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild
index fcd9706fa661..7f17cd0d6110 100644
--- a/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild,v 1.1 2013/05/10 16:03:33 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild,v 1.2 2013/12/01 06:13:50 vapier Exp $
 
 EAPI="2"
 
@@ -95,5 +95,9 @@ src_install() {
 	use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
 	newinitd "${T}/pkcsslotd.init" pkcsslotd
 
+	# We create /var dirs at runtime as needed, so don't bother installing
+	# our own.
+	rm -r "${D}"/var/{lib,lock} || die
+
 	dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die
 }