Add LOCALSTATEDIR to cmake args to ensure that /var is used instead of /usr/var. Thanks to Alex Turbov, bug #556660.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x229E5838

3 files changed, 25 insertions, 17 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 1ba880710631..81319b3d58c8 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/schroot
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.44 2015/07/31 22:46:23 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.45 2015/08/06 00:00:43 jcallen Exp $
+
+*schroot-1.6.10-r3 (06 Aug 2015)
+
+  06 Aug 2015; Jonathan Callen <jcallen@gentoo.org> +schroot-1.6.10-r3.ebuild,
+  -schroot-1.6.10-r2.ebuild:
+  Add LOCALSTATEDIR to cmake args to ensure that /var is used instead of
+  /usr/var.  Thanks to Alex Turbov, bug #556660.
 
 *schroot-1.6.10-r2 (31 Jul 2015)
 
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 24483c0db9d4..2bf5c99f6cc0 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -11,26 +11,26 @@ DIST schroot_1.6.10.orig.tar.xz 797328 SHA256 3ce8dfd9cb97b099e4b6d4ccec421d6cc8
 DIST schroot_1.6.3.orig.tar.xz 730756 SHA256 0b914a0ae1eef0288e5bf016c14031d3433d1b3f18820bebc5480647594ebc82 SHA512 e435715091eed17e1f073218b2cc2355ad529bb702b9f8cfeb58ed3be38b78fa61280713801ce29e5b21c93939f5898e6f6e4f493d3f7d2550a873289a6c22be WHIRLPOOL 065142aa34a225d0cda44ca3d3703131fe2a0ab46ad914bf386a58dd0480650ca03a5b6d00216eca41edff5a534083874d121623002aec57e933a95a4d2cc60f
 DIST schroot_1.6.5-1.debian.tar.gz 30518 SHA256 acf7cdbbb486a5724e61d10ba682df24dc66ec9274c6897f64b7dbd5f9632aed SHA512 3f5753a877cf8226f9eb085620c91f3e6179855adb7faf1f60e78d12b30ac545f6f6d124a239bd6a8d6b3ac28b417ee1d3ccc7ea4978cad77f3bba1d6e2c043d WHIRLPOOL 13b8afc0575fc1d4e27e35ba0cf277ffb04353b2dc0ebcfb8596d6ada064402f2004bd0b9fd658daad8cef69c1a3c5d615be0569335f6b243ed2f09134d63543
 DIST schroot_1.6.5.orig.tar.xz 737656 SHA256 290d1af4eb06db7678277a5aa8104a69bc33b4e0f9b502aed166061d2717343e SHA512 2f7285f9e76fff8db2a9a7cd66f4d06c2c19662f812c3b3108be45bbc6a67bee63b39b56235e257ab226c35efdba6b50a2e2511a618c32d76da10a0d7843fe90 WHIRLPOOL bf9dcdd61862719492bde8e67ca5cd3b42e368cb69e57382b88a85aa1b34825ab40bd2e9f82f4296a0d9721a38fe03e8161f49931a95721be835d52a3a9108fa
-EBUILD schroot-1.6.10-r2.ebuild 3000 SHA256 9f2feaf6052a34161a7718ad4c4b8271201ceff8a57be84b229e149acf53e555 SHA512 2720a20d5b260d5a50cf18c64a4ad1981da1211d326057fbb09ddde3edff50834eb1e4680673636b2d56e21d69c5a7851ba06a33dcb09ce713b8bf5868d91798 WHIRLPOOL 7ad595cdb7ee9e8b8f5584ac01566f54ec8199ef163509a5215b6056a1c4388facafaf935c35a1583d6daf971bfdc5294f9cfdbfbde428d2c56b09e398b8acaa
+EBUILD schroot-1.6.10-r3.ebuild 3049 SHA256 e92032965bc3fc7b2b7d8100bb6171fdcd1c60ab40c82eadce29c39173349d42 SHA512 a12558da43e2d84c3af1d0fee1bc62e0d4fcd74c1790db7852335505d22bc0c902f9f100535f31dd4d41697fc1d3abbde1262798c2e0110a34ed9240a26f3f79 WHIRLPOOL d59df4f700fd47c5d9df84d739e0156a66b254795b16a720b3ca454e778c1e70ac7dc68979fd4954120f6b9e81b25bed9e737f537b1ed0ad430eb8e4fb369ae9
 EBUILD schroot-1.6.3.ebuild 2955 SHA256 c0fe9da9f49cdc0086a5a8cfe67974d813d67fbe3d01d17dbcce5e3140e2dfc5 SHA512 f2eec795371d8c26d86208204da92748f2cbc44b5bed83460b3d9dcbde7795cb89e7c08cf46bb1f541b66d4a5210e595481875bfa456a7584badddfdfda9a7c3 WHIRLPOOL 40d48232b926e76e32cb015dea2db06d1c3fa58959d9c9d41799f59d6c0e625fe67d865328a363f5893180275d5c953c060ef3b9016db5853fdfbd862d51312a
 EBUILD schroot-1.6.5-r1.ebuild 3160 SHA256 5a3999e22c296d747991bf8f3812a4abd418c90bf8893b44b9b79399b99137ee SHA512 2b67cd0078b987c3226f2a7655af66d0a84a64e924cef5d5060a4899781cf8fd492f757cb6e7b7c6e9b69c3f6887cd81d86a82c8e0c4c3158d12bd6208fcd7fb WHIRLPOOL 0f1ec8ad9e7ee3e1652417895eee49b45f0a8907a65d5159c876e73c230178885d9dc25ebac5e946ae6df616bf1e04dd54179f449cb8987f79750cba56a11a21
 EBUILD schroot-1.6.5.ebuild 3154 SHA256 13494be1f6f9819659f245c23ecd44b23d1b4a979cc29d803e42385dd9ca1c99 SHA512 fe865c332ccce9d96af84208664d2560c49f1825031036b3205a11f5bdefbb9a5767f3371f6d50c6ed3201f5055312c91404e3c90614342119c150b7bef3a632 WHIRLPOOL c74017d6260f343cff4df6c77497d0d406429330796f8598a96fb6729c728c87bdc8c76fa94546ede89203225316729d0576710367d0d267befc9c6d461c9f15
-MISC ChangeLog 7805 SHA256 4c6a33fd7c0cc81a9aa7b6d7a6421e56774cb58368677c567c2c60d8d56634ec SHA512 d9fcdf7fa2332a3ab5e4ea3a97c7f65487f227b076e6b210673a46c99cc59dcaed2ab74387d75b11d01994f01f908722ef9432028b1504742cfa3f4aa60e030b WHIRLPOOL d2f6be224a040200d06e10ab6adfe9bb822a63690983bb044b3ee8c31ad32bcc171ee74cc4150eb4f9a97c4a88a5e6700024642171ebbc211612dd07b74be011
+MISC ChangeLog 8070 SHA256 3f91afa740b3945c3439d3c8d207dd7e6fb6b3666488e98469e7fb17037637fb SHA512 936ba7ba19e5a11b4be82b2bc7ad95ca6bf5d97145e97941e4291458cb2665495566a29edd71e0ec66b7391dceed84b8452286590011318c540e42e1932d94c3 WHIRLPOOL ec5c029225e0417f6fac0d5668a8d77a91683e7f2650cdd0276980ef3305dc44829f70a10521df06638069129b7edda15a7115fc728b71cf6ebd9f15ddb310bd
 MISC metadata.xml 518 SHA256 2ed5fd79a04cbf7a35bf2f1381e68da5dc648a14dc42d16890cf2c38f8772a40 SHA512 9695afd92e789ee5e380339fdd9c074439589e3c0ad7e6d1e9ee3399a64ffd269b6328a49c2346d1e0224a4be81f5c3023e2cb34fa6a6f0602cf645950cee259 WHIRLPOOL 952634954aa59c7df9ebbbb0efd82840c58c86727cad395777b5490959f810346bbe08d90d450b562c7fb9ae577fa5a49321fdf264a1b00b1f3ea0ea5e5f6d31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVu/rBAAoJEEIQbvYRB3mgWAAP/1eeemun1kOy1A31PsF30Vzj
-uvIM8xFp9NZWVkqefbkMdNchR5aeTMk6gJlEzjHVxSSbehof/G1wg2D938rqUcYz
-BTv67hLHjD+qjSEPy8Y0F9AqIoBkHNGJQiVFkm7xafxiW7W0Tv/2QMoEr952SPMl
-Fw0HltYT1QPCwdm1vFzZqyjFsxD8qK5WeboVZib/Yb1O1ym2txJwGvXOARkHXjW1
-knxu2eFuZ1JxBv5bHtSkELrt4WhwLElGoTWFxZ8egkcxgPys5UYgVx3029ViAt0V
-s8OrGthSlys+rnFdpfINYCNmy/7LtkPvxV4Q1Je+uKtO8um15xNio1lxgJIbc9Tl
-JWhnmC0+i9Q7KogXyEuo2cfLvEJEwGa5FytubZP8RrEwN3A0nCsiyPkNJQ4eXx0E
-rV+uZiusTdynx2y2xNJVlDYyGtcXHCQybRlDpsYUE9HoXcfRawLoBc9CWGFt20ZA
-9Y54jYNH0CkFo5Ci/43/08SVcW++nMVBj+So/aX5WqQlazD3jcrgPd+ikNX2K4ud
-9JcsuuqFxlW6zkS76kO5grHlquvx/IFREyMVYH2hM5Lz9boX9kRob5vsMlSqBVHR
-+RSxG7FhybjCNF/d+i19WE56j2RLro/flAz5jPOMPefFqkv7smleRjMnIIDLykoJ
-VFJq9N5VBmo1oZcenAIe
-=Mchm
+iQIcBAEBCAAGBQJVwqOtAAoJEEIQbvYRB3mgSVwQAMWNlirbTWOh0Abcjmm9jOVL
+4Fu9HiPycPuYmlutz8WQ+63jbiq2B4NCIQgL+QY/E8ZJX/Y13S+IditibLeeaAhr
+lfeXYiJ+gZAYN6TNpifMuf1Z5dVtWt7ZpNx9LhxBdHXiP3oMTr2qg2xQ1p5u6/qr
+sDmz4VYSZB2L3ouPPr0SvlYKoe52/TOvKFNSdB6sQQ8QzpRk+V890puXQ7Txi1yy
+INZxIJT4rH/9gWBzBtcfzvDxFBkVEf+QMMOyv3UlozTy0rITcU6Q1M+0qv0dITG2
+vFHdX83oGY4NK2DG1y4KWRnbppzljJlcXI0LaR1v06dTKh7zyP2ZrxUaZWqOMVMf
+5gYntkKQpdNU/jvu5thAc/BZQl7rJLnDxOMLpQN/5p1BakHJtGRZwXJhiihMvi7v
+PV+xNgxnaWmi/Qkky1E0XDUs0RbRNPd+tIE3QfYg9fcHY8YtCoSYch9DYPJYIo1O
+l8qlKhb5Of0KwuqTw/79jV+3a7qReJKkVbk9vCtXIyGx70eH0R3VUK3DJDtBnSeC
+vVhIkVDxZHAhaNBQH+geK+woYR/zon54hFzNzVlQ2hgg5PakWM7aqO9Vbz6J6LS0
+wcLSF1hqJZwKq+g2xhuskHQ/WylAmzie9LcCm51ZUbp2rG5iPAUUG90XmdRUeUCk
+Y1jkTmou9FH/0VRg16Ys
+=DRK/
 -----END PGP SIGNATURE-----
diff --git a/dev-util/schroot/schroot-1.6.10-r2.ebuild b/dev-util/schroot/schroot-1.6.10-r3.ebuild
index 43e5eacb1179..3c8d6885d34b 100644
--- a/dev-util/schroot/schroot-1.6.10-r2.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.6.10-r2.ebuild,v 1.1 2015/07/31 22:46:23 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.6.10-r3.ebuild,v 1.1 2015/08/06 00:00:43 jcallen Exp $
 
 EAPI="5"
 
@@ -76,6 +76,7 @@ src_configure() {
 		$(cmake-utils_use test test)
 		-Dbash_completion_dir="$(get_bashcompdir)"
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
 	)
 	if ! use nls; then
 		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)