adjust paths in libvirt-guests.sh (fixed in 1.2.16-r2 only)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 47 insertions, 18 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 363ab3f44470..217d29c6bda5 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.433 2015/06/24 09:48:26 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.434 2015/06/24 11:07:37 tamiko Exp $
+
+*libvirt-1.2.16-r2 (24 Jun 2015)
+
+  24 Jun 2015; Matthias Maier <tamiko@gentoo.org>
+  +files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch,
+  +libvirt-1.2.16-r2.ebuild, -libvirt-1.2.16-r1.ebuild, files/libvirtd.init-r14:
+  adjust paths in libvirt-guests.sh (fixed in 1.2.16-r2 only)
 
 *libvirt-1.2.16-r1 (24 Jun 2015)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 26a06fc9a286..b3e7c7da6251 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 SHA256 a8417304d8dfd4d042956d33bfb373d61c7c2c0e8ead8c384300bf32f8acee8e SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588 WHIRLPOOL 892bc9d14257929718e29671bea2eb44ed25a8ed5f7f4d8ee72c9d82a4e6a96b5da67f43279de29c06d6abe41ab2792b48515c2dea46aa4a452d76e85ebda973
 AUX libvirt-1.2.9-do_not_use_sysconf.patch 3879 SHA256 1a0c0b29c481097ee218cc752b11f00193a87a010feefc71ea3f56e041c5844d SHA512 cd8881ed2fd928e4fc122a8615fc328f515181129253cba1124c1faf48549729428113822b56034143e192c44944b1a40e83b960f742db64738e5bc05b9bb371 WHIRLPOOL 9413e40883d98d5d78a2c269786a2f640ec9689744ef431a4e9a092d251d33deda954ad8631520a04a16d8c30ca2e9b28bc8b78562f27267f80740901907a253
 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3
 AUX libvirtd.confd-r5 2695 SHA256 6617c4e613e4a62a1539682bbe735e4aba7a412d2753bd2a03bab1290e4ce544 SHA512 e9cba014acbe6c8f33c2479645aa470beba81007de00e1cb268e6fb3002e38947951ea3e5635d0f5420cc29e5a6f6e92e599f42303bc230ebbe186e4feaeb80e WHIRLPOOL 1fdc7ae668ace460f26d5e20010b8edc6623d6c3fd06f5574bce4aaebcc5e63979124d86948eea1ee249fc18846d25c4d61871d812805cf75307766675f0e820
@@ -12,24 +13,24 @@ AUX virtlockd.init-r1 689 SHA256 d156cf6a2b00d8d81529e63231fd49b2599838f6c79740f
 DIST libvirt-1.2.15.tar.gz 29094868 SHA256 5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6 SHA512 c5dd3af86e89e3804d6c3b527c6dbd98c79d87d2591725a13af33530e0e9a9a2e9aeb9491844469d44ec4f4d17adb036c76391f964158ada23ec042a75556fbc WHIRLPOOL a43aad4caeff707c8d7a6872ff3c46911c96fd90ece02a7f6ceabb4ccd00e467b5341ab9d922912cc2968a2bb8826e970b253b257c5a8981b37364550f9b3616
 DIST libvirt-1.2.16.tar.gz 29157627 SHA256 419bee553442024b9ee8a1fa94023b1189bb52b7c3021fa37d8e4c108490060d SHA512 ad2892d143b28784146191ec0c4e3fc1f3d246b51c39c8bcdfc6ecff59a4021b94277fc14cef04436046d3614baeb4edff753d0158c5da35cbb718ab8692950b WHIRLPOOL c48cb4f4e4be0994600f924d616112e112bd3a9a695cede70512995b4d563c92f82918298313472c440751213c893cbdc54d54b2e175b969df157bd486ef7207
 EBUILD libvirt-1.2.15-r1.ebuild 13131 SHA256 c50110060d9416498d0cc2cd85b2013d980e9c86b217c2a25bfa7050ee5f9996 SHA512 1f0eea99535e38c14ce1790060b8ed85268c14bc8c49e2e55cbccb069525039644b8b866e19bcdd4021a5bbecbb63f57b4077be6f5826864ca4195c13de06b2d WHIRLPOOL 82c8e0b30e2c17b0a9579fd6eed36fc9469ccb87b533b08545dedb16d6a2aa328d8909bda62342cc5c59ad169f285529df2904916099ace66a68d281c9ef77ef
-EBUILD libvirt-1.2.16-r1.ebuild 13136 SHA256 15a1e9eafb2f5aa44fb87f9856a9398b17a0857cd02bc373f4bdedbea83f6adc SHA512 612f43c9f5ea8dddf0ddf8030accc667c3cfb5b7d436824364e4951e72eec98e60ffb3d7dc194890b5948fa3cd8ac7eaf9083775fb86e6e5d9b77bad5513d004 WHIRLPOOL 310447adea61ae5d24b04ddcfe7e056e36cf50943466327bbc9968e033b0f97c854161bbe93af551de2f48f51598639712beb7e30d2cc55ebdf6fc3b99b3ff7b
+EBUILD libvirt-1.2.16-r2.ebuild 13200 SHA256 d7b74a7299e7d3d6eed0f60f4d4e3edd432a90838ffd746607bbc754bfd29c63 SHA512 ac3f87cbfb953f70047c9a305ea82ec0146355c129b4be702a4975b410485216ef918c22ffb4cf585dd923750016a6ddc0855991155f3ac593e5d0b30968c8fc WHIRLPOOL 037cb129a4a27ea4d6b87e4297b80a8d8f92957a27e34cfcf20348c91420246d49f335f8a7717be1ba2a239508aa260058b9de3dc06cf9a98ad2ef56eb17406f
 EBUILD libvirt-9999.ebuild 13092 SHA256 53430ab82678257e62c86e5d13e4811476e0d3ad4a5f1050c2920c50a590d1f9 SHA512 bf468105ef362ec939be0bd7990da535b4e16070627e2a4b83ce96207b5db5110647b94b6e3c91bff4d5b3f60b0818b0a83d4552459c6468c83bc17d0ca16d03 WHIRLPOOL ab383f95df310af2e4c42c03318e7a4788b5f765b6390e1ed3e70852c88c223db94290c8025dee2aa047ae4c8817dbe9c5803a6c7a451310df2eeef9331b91ac
-MISC ChangeLog 30911 SHA256 89e281f785c42abf3ccaa202669b4586dc62cc67090fff19e43d6f2bfa0d9852 SHA512 15030b827033f52f764e64716c15c2ef30833649206c77556d082e678db64208c86d26c604cdbd04af20f6b22a84399e082b6ce3776bcc063f0d9b7671b5ad95 WHIRLPOOL 001c3c5acc335ee290a54ca14755f3400e9098bbd3c196fb2ccbd519aae9c92d540aded73f9a660ad3646ac6f3cde1c190ae82ed9ca940ac1b2da73134e86ab4
+MISC ChangeLog 31201 SHA256 6b6faacc9941d1876dd595ff048b6d74d0398a39739221863ed874cc982f51d0 SHA512 4a594ebe1c2d8b9a764124c74a3e2780636b11ca339cf5a237c52c060f3ff75c5d747db4219121e1cda5dd42a7e5ea261659158f5d79fa2efe2f58a8dbe3edec WHIRLPOOL 01da9cdc4edd330841833ce9d99624a65159e749880db3277aa71edef83ecca98c319df3b2ee78065437dbec16075b05c8c6fc1f13e2ded619297550d8749b17
 MISC metadata.xml 3604 SHA256 90d98bcf32df9c4ff5d3fc90cdcac46ddc486efa9706b945cbf749d4a1ddcd30 SHA512 35b1fd9faa961efddec324d3721699068b9b2aefb49271f064b3930c9c246a71829f55566438754c34f294db9b8c2ad55386113a72ab11b31cbb604e4afe7816 WHIRLPOOL 6315f8a01134f62a1f7b9845f0e89624bb1edd713b4965a53209b199609ba4f510f0cbb4ee85f348947556cdeee27ab7ae7fcf52b1b9ed82176076d149c00116
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVinzrAAoJELhOzYlK7nn/askP/iiczakU2wvzbtr2jBeVuVnD
-koZ+gF76REQo7XyZpfngQpCacZkOCoFHH/i7WQCrWEj7GvfEAc1LCaEWEntadWoN
-xNJb0ZJPrmi0tjFqCA446+dQj+33Kfr4n1kG3VMU8gnFEGIi1F135TLTMmNuyB08
-tGEi+E17pEfGUc24mFqxDXSo64dYLnPxXLcH/h1F1Vmbik2O+h13Q9Id8oLCihyZ
-Kxqfi3wscR7bRLPrSP/g733TVkKfyPUhg3Gvwx0zwwDprXWeuoBWDRDDdQTDCur6
-csMyKQvXgKObJlE76Ih67jMxBHa9k0FYXdDP1DX41eaTMj8t+KKQjw/gbFHZL6OS
-xW9gyVb2TtG0ybdvzsT087U47Ptkum1vx6F8I0sV+J3Cnvhc1rPm/CCWEkPzkoLd
-whSynD7md5GWttlV/jDL/ae+/2w6/s5CTiFHL/1OH/rh73xwzXNay9230gLpMM1u
-qCzDcPi8f/kyzKXMC6AB0MkGki2Rne4NZpOt9nxzgzYqO9QvvKMP4y38xcbSwSEg
-3UDuu5IC+TXr3ok+ysoYsjqWGJIdwgwqVcmx/lULZejcn9hnjeKEzORKX3Ix8HC7
-YX1IxfdLcRc2A9+S36Bl38IQKYhbAI8SwGbBt44THg+6xjtsMIKkMDYfyVAZJaB9
-kpDWqg6yLkismqgx8q6Z
-=riOf
+iQIcBAEBCAAGBQJVio96AAoJELhOzYlK7nn/hxkQALkq62xJXTLyMbJDvY7acDMP
+tEZvrDR5sL/1Dsz9/C2WMp+IXPo7CbiU8jxfQuKF4qSTpkabUKN7DET94BXZ4vsy
+s1cir+kk6TWzLOnIxC2WigdLv6lh7nWGz8rNme+DMsXpu4IUPtZz7rlYd2fYlLhl
+4Y97Z0AuoXbi+QmRyjQNRHk+2ujkJzWLQ8Ny0XlbHsWFDq1WAiLOSR/Kxv6nRNQ8
+h1dKOKofpOTTMNVdUzt/PRSvu0Bcg8qVPMhQp3NuTcVAXzUzvTsrnNS7AFEnYM9S
+GnEaxRdFMw7wjq8yAI8BlRLy2T/oDn02ETIt/Phl2m115kkl0hzA/j7oIBf2PDAc
+KCpk9QwpehrHJT2touJHoeUujcMgV+HKcRy8QyaRgPjAVbQVPor08g3a6Y3nIyGI
+0+hmC6k5x81rnxfDqf6U2Q+fXPkQMsT3JL4Nll2E4YXkYM01DZn+VtgCVAmbysdX
+3ehUKe61oY7QA1KGS4wqh4/Mz0PhTfOPgfeL+dWD0ov2C/cpiZczkJOvx7NQINKg
+ksszcBsROsZffa9u0u3+5MFBa1uIxi3JEeYPfiQJerE8YR3DIMtqL8EPu3l81Xg+
+FWP+MOVvJbHwIyh+N4hwBX28a+2VKMaCPf42T+j1EAxI07WoeoJXRwDx9yyfEFqd
+aUzCdAz0Zy4XjzXFDR6Z
+=1pAi
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch
new file mode 100644
index 000000000000..ddedb1f90cd3
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch
@@ -0,0 +1,19 @@
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index 7f74b85..ea58119 100644
+--- a/tools/libvirt-guests.sh.in
++++ b/tools/libvirt-guests.sh.in
+@@ -41,11 +41,11 @@ CONNECT_RETRIES=10
+ RETRIES_SLEEP=1
+ SYNC_TIME=0
+ 
+-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
+-    . "$sysconfdir"/sysconfig/libvirt-guests
++test -f "$sysconfdir"/libvirt/libvirt-guests.conf &&
++    . "$sysconfdir"/libvirt/libvirt-guests.conf
+ 
+ LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
+-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
++VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
+ 
+ RETVAL=0
+ 
diff --git a/app-emulation/libvirt/libvirt-1.2.16-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.16-r2.ebuild
index 41d3d912ee4f..c5e7146be2c5 100644
--- a/app-emulation/libvirt/libvirt-1.2.16-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.16-r2.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/app-emulation/libvirt/libvirt-1.2.16-r1.ebuild,v 1.1 2015/06/24 09:48:26 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.16-r2.ebuild,v 1.1 2015/06/24 11:07:37 tamiko Exp $
 
 EAPI=5
 
@@ -227,7 +227,9 @@ src_prepare() {
 		) >.git-module-status
 	fi
 
-	epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
+		"${FILESDIR}"/${P}-fix_paths_in_libvirt-guests_sh.patch
 
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \