alternate fix to Bug #472976 by patch by Andreas Kinzler wrt to Bug #472976 by Andreas Kinzler

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 31 insertions, 15 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index ad1934fd8ded..81a337a7c940 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.185 2013/07/30 06:38:21 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.186 2013/07/30 07:08:35 idella4 Exp $
+
+  30 Jul 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-tools-4.2.2-install.patch, xen-tools-4.2.2-r4.ebuild:
+  alternate fix to Bug #472976 by patch by Andreas Kinzler wrt to Bug #472976 by
+  Andreas Kinzler
 
   30 Jul 2013; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.0.ebuild:
   verbosity level hard set in src_compile, fixes Bug #477678 by hasufell
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 8bffe9d3085f..f44c3c5bcc38 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -41,6 +41,7 @@ AUX xen-tools-4-docfix.patch 438 SHA256 016120c2333667aa84861ac9289c48a072c4842f
 AUX xen-tools-4-qemu-xen-doc.patch 820 SHA256 691b2d84f7312388d528c83f3e9e90521e6b2c97abae8ca8a83325655264c98a SHA512 bc07420be7629796e49e128c1cfbde8fa7d4dc3b66174462448e9033f78c0c982dfdbd4dde9b1c54a9862fd2f9602c6bac0be1dfc0df8280aaaf8de60acb708f WHIRLPOOL 4fc2907a42bc3f824160f92586392f7dba07c2229382585f5f7bf4c0f3ab2574a814e8e8fd076b68abb2580497492e1fc0e6181ffb8f1acb5c70e60caff81505
 AUX xen-tools-4.1.1-bridge.patch 449 SHA256 71eea5408e3600c3c6f7ce4e8363ea2c19db36c1882e20cf0ef8143af527782b SHA512 3e4021c363bae11874b13675a8ad6aaf5b733e42a18e0d1259dce1cf2c305440dde13a7a08a584213dd96fa4b0a788048f6cb87a0f5b3ce777a2048215dbd779 WHIRLPOOL 9363d615578696899ba84d6d2026d3cc5115756a9d0ca5a91071ac4db6e2fa425135bbf6db320e90daf78f89c6203b291dcb2cc25a6e5db82b7c094d3c940cde
 AUX xen-tools-4.2-xen_disk_leak.patch 2324 SHA256 b5d07dded35d48196afe4e52e7e48ef459b527c4b34f1aad13710dae94cba6c8 SHA512 bb8a36a30e69f6d09c9293cd76f071741ce04bf0d0129d9417b3fc41841f6dcb0160506a80222e67d58c78a289072913578868d6a055eb23266d15d5fa59ebe2 WHIRLPOOL c0c69406f564b335a3215a7cea8a447ad7d2b27590f3cf92c74c74356c46ed26557fee3ff5fac5a8ae54f7d8dc1772500d75d9de1630a57ee48d8193a6fdd1e9
+AUX xen-tools-4.2.2-install.patch 451 SHA256 85f2d3b4318c95e5a27f1997ff7f8368ceaed1f2d461a9b0279a103d7dd6bb45 SHA512 2deae04f33241687876be4d96d47de0b858bcdd99d00d57a3269b38cfde49a0b37a0f0a4b4d325d59d75ad5fb3f6a8eb556cb7cb948572e67b499e3bb359225b WHIRLPOOL 9c81cd8f1b1253eeeaf31a169c3a1b114681f90c6beeacbbe25bd994bf88e66e2cd87094615a953285844d9436f08d793bfd06c567eb18c6427f10fcd479ee5c
 AUX xen-tools-4.3-ar-cc.patch 4036 SHA256 1470887a8ced12d8df61ef74d6dfcb36f2822fa95da7031162ecb577f69ae49a SHA512 1171b5005a24fbbcd4ad9a68153c78ce816aa823f0452a707f3e26d5cee0a0faa05d917db3edcdc7f2924dcf9fd8aee5d7ac7a419723eebe3699be7a32765dd0 WHIRLPOOL e5c3a2adf7e55e7690c4123f442e8f43f66030015228473f9d4d69230eeeb82714c89f502942cd9a76e0637d70f6dc2ebed7eeb3202fbb6cca430c8af420b549
 AUX xenconsoled.confd 44 SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060 SHA512 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d WHIRLPOOL 503f7b48842724e69e7e4ae752d0570c339b7214b5a5fa1db51300e65470803bb383524f6de6c5c08849a961f628f6db7764e3eddcc19accbd209777a0f27d68
 AUX xenconsoled.initd 652 SHA256 3d05ee3ec46c8ef8c12efe7043663932628b2b8fbb2df6d874887dfb0a13a1e6 SHA512 cf2b345ba2eb861c530d154dbafe48c6423b9e4e8333df8bbcd74c542e6db795ed6af45b24dfe40a1351a69c9062e7bc8cf8f07d6bd056c235d68b0e49b148af WHIRLPOOL 5fe06a9593eec3317bb824b2986e5582a3117cddd0fa7370f7971ab9b47d116035eeef644d8f1c5003e0a46cc04f05c934a047233f90359f7ae7ceff0b1cf3be
@@ -61,14 +62,14 @@ DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe
 DIST xen-4.3.0.tar.gz 16425975 SHA256 e1e9faabe4886e2227aacdbde74410653b233d66642ca1972a860cbec6439961 SHA512 e6b8f64e15e48704ea5cee5585cd6151fe6a5a62bc4670caf0b762c1aa71c9598db236c637ac34c42c92c6e8a5001acdd3d9d4b9305401a26273279358f481d6 WHIRLPOOL a91f14bc6535127ab17d3867b92fb3e008089453d5ba7996fd1d0b5c6d32a881c07df320f018c928e919f28de7b4ab4757c6bdb020e0cdb7d67960d4cab9dda0
 EBUILD xen-tools-4.2.1-r5.ebuild 12036 SHA256 4bfc80545588022891c5c4fa752803887ccbccd99353a9264f53777438b85d7b SHA512 819fad9ec0a691a020537858c4310fa65c7ae5ac15dc8abca9b0a9cff7a222ffdc994d3327bd0938960a46365bd8da39f09dcf3e1ab9f3f39f8b4624c04e483e WHIRLPOOL 4cdbb2e4783d910e3e444236edcaa315bcd34f87b4f1e00fd9597573643273c4d586fd45060d3f454a8735884fe8bf97b1076cff4e87282adfeb53ef3565bae2
 EBUILD xen-tools-4.2.2-r3.ebuild 11753 SHA256 9b004f7a79b6ed309d6ef6c311281cce19946d8fe3d7af6017efad098847d38a SHA512 d65b1935abb7f37b26dcb654d721029b03afdd3b66531b64474c3b1ce0c6b757ca315336bdd1c0ca33948226a3630dec717aef1ff612c8d028747fca8369b4bc WHIRLPOOL 25a6e33e01c3e857e3d312b1af39ea7a83e76682f8398027a32a495259d874d1dd545cd9b4729a6a4b2c34ab9a672da904e8b8820f7ff45061452212d42fa63c
-EBUILD xen-tools-4.2.2-r4.ebuild 12180 SHA256 df977c031ffdc089181d09065624d97a90d93d79a0b8b8a8dcb87eabb14ac7ae SHA512 8fb242633d8733091bf8f852f6b76dbfc89d8d2bbe673e56ea7b843cb45aa57499712f2e9267b187662e9970e042b19444b2c4054a2ee3ce730c5a0f62d196d3 WHIRLPOOL 7fd97ae630051dca76b982300cc0423b68b0fc70e0de18dce75a7a9998de0c6a1e3b727781d2db45e5208764bc38e11cdaea7ad14bdd222cc572d3d600c6b64c
+EBUILD xen-tools-4.2.2-r4.ebuild 11915 SHA256 467d6cacc60696ecaf0eaff202c0ab25f21c319e2d95f96e70d4511eaecc9295 SHA512 8474e5bcf1d1e0e951adf18d6c266f2474d4ca0cf295269db9cf322cc9f09cf30d8b5dee1415e9b395b122c2b664d2e478437b960db2d128e0baccbf9c78780f WHIRLPOOL 2b8c43995d4d8e7ddb3d567e096eeb5868bf6a56d06ad4ff6a465a57465e53ab083b3972f7c516744ac70069a4e64a725fbc74a743a501a036c609aeaadb2bee
 EBUILD xen-tools-4.3.0.ebuild 11732 SHA256 6e9b016c7fcf7206d8371c4c87ef624aa5ae6e738fac3d41cf1127ca72833b12 SHA512 9f19c401a737685d0e1f8df4ed03574091a826bd21a4b58402d4957217059c725a2bad497de766ccef01b140534b37b579a6848a413050be05a11c6608be3b17 WHIRLPOOL 5c1fae61eeda63829371b1c9bddb291c3e14f846569e3a4e1ad7d427683ac757a5981509ddae1c2b500437445128bafd25f7be31b25c526406e23c0d3998670e
-MISC ChangeLog 44613 SHA256 1c941d266a3b966914db2bcde34cd4ec3a6deed6d11a0578dd930397e02bc8f6 SHA512 57debc87d5b4d3933879bca4f5b85bb09aea1bda3ce428fb1974185b6415e7aba09d8235d2ea3d1352222b3980d46d1866e7fbf7765b0e2e214c1f07d8b9e688 WHIRLPOOL 4f9919a031420855abb43b39f0477fc7a6c59248f8f640764ebc6057231e9f2568f91f0f8c96c83679d5224f72df42109e3381aa881eae13e3c057c2aba62edc
+MISC ChangeLog 44828 SHA256 3a05d67968ca51483ba5d47bdd8f8ad0676b8147825443968aeec57a68ac79f0 SHA512 b62adbf1001311541421180398ef4d4e353188583b19b0529e14ea7a51be4a7f58f8c5e518ea760e348c296d645f3cfc6352308cf07e4a6f84948528c676cd4e WHIRLPOOL a3dd901b433718b0ad0d4d16061744ee8112ae3451279cefebd31cb32725a5bd4963e1cad5b10bb4937030d875dcb14a857bd4d537ca17e247718da85f075eae
 MISC metadata.xml 881 SHA256 52d19c65a78ed979b0d6df2f83fc281e8622296e2686c199dbc58cb76a70a57b SHA512 3e2400037f840272c38b0a7b9d46f9975d512bea13e6dc21bf8458fb68b1c741f4458a9eaf18aa53c3183ef4f83e70e8ae50e28132e563fc4a1d6463c77a586d WHIRLPOOL 3b030061503f4c2beec7f51d3bf790f358a4837d78d7a0faf0eee5214832fe888445a53c0b09b94bf8dd811e44523e0bb05535d58583499df97b32280f722312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlH3X28ACgkQso7CE7gHKw3XDACgx9rvrnY3rjFoXPTMAmdhPrWl
-P5EAoOKy1/NUpGcLnQD1wQq5igwQ7fW1
-=x1kl
+iEYEAREIAAYFAlH3Zn8ACgkQso7CE7gHKw2YaQCfV0D6URi5PLH5Igtq91TMn6Ht
+zEIAoKvseK8I3EAldThNoG7W/0HN0yXq
+=FsOi
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch b/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch
new file mode 100644
index 000000000000..fd638f62e64c
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch
@@ -0,0 +1,15 @@
+fix invalid installs of docs/man and config into /usr/local
+
+--- xen-4.2.2-orig/tools/Makefile	2013-04-23 18:42:55.000000000 +0200
++++ xen-4.2.2/tools/Makefile	2013-07-29 17:01:33.764093405 +0200
+@@ -199,6 +199,9 @@
+ 		--bindir=$(LIBEXEC) \
+ 		--datadir=$(SHAREDIR)/qemu-xen \
+ 		--disable-kvm \
++		--mandir=/usr/share/man \
++		--docdir=/usr/share/doc/xen \
++		--sysconfdir=/etc \
+ 		--python=$(PYTHON) \
+ 		$(IOEMU_CONFIGURE_CROSS); \
+ 	$(MAKE) all
+
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
index e5fdeae24b69..ecefcac0ae66 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r4.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/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.3 2013/07/30 06:34:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.4 2013/07/30 07:08:35 idella4 Exp $
 
 EAPI=5
 
@@ -202,6 +202,9 @@ src_prepare() {
 	# Set dom0-min-mem to kb; Bug #472982
 	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
 
+	# Bug #
+	epatch "${FILESDIR}"/${P}-install.patch
+
 	#Security patches, currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \
@@ -330,14 +333,6 @@ src_install() {
 	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
 	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
 		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	if use qemu; then
-		mv "${D}"usr/local/etc/qemu "${D}"etc/ || die
-		mv "${D}"usr/local/share/doc/qemu "${D}"usr/share/doc/{$PF}/ || die
-		mv "${D}"usr/local/share/man/man1/* "${D}"usr/share/man/man1/ || die
-		mv "${D}"usr/local/share/man/man8/* "${D}"usr/share/man/man8/ || die
-		rm -r "${D}"usr/local/ || die
-	fi
 }
 
 pkg_postinst() {