install fixed if IUSE efi for both sub-versions, thx to lejonet and Zorry wrt Bug #45897

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

4 files changed, 23 insertions, 12 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 101da380e941..fdd1033d4765 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.111 2013/02/25 17:43:21 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.112 2013/02/27 08:03:21 idella4 Exp $
+
+  27 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-4.2.0-r2.ebuild,
+  xen-4.2.1-r2.ebuild:
+  install fixed if IUSE efi for both sub-versions, thx to lejonet and Zorry wrt
+  Bug #45897
 
   25 Feb 2013; Ian Delaney <idella4@gentoo.org> xen-4.2.0-r2.ebuild:
   Add the intended dep to support efi in 4.2.0-r2
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index c3688c7bd517..4d30ecc328ba 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -20,15 +20,15 @@ AUX xen-4.2-efi.patch 617 SHA256 27ad79e890a273deb5351e095db61e4159669e3fe10e374
 DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
 DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37
 EBUILD xen-4.2.0-r1.ebuild 3759 SHA256 653466405aa3b25fdcb8c6fed8c7022caacef8a837b2d58c379db8ddb76e58f6 SHA512 fec682dbc7e353cbf5c6063592b806815c2f86dbd30e36e09cfc650ed684687fd3cb67ecc54973d341aaf12c1776614ddf596571d5312278bad95a363a236e5e WHIRLPOOL 297608eed32ebd51c60667f78c571d3502344836e5814146ea644dce27b6fd9ccbf6b877b206d8828f531e2147aeb2a2355ba7bad03e7081b9f8c397c0ebaeb0
-EBUILD xen-4.2.0-r2.ebuild 4130 SHA256 fc5a03fc4ba716480ed2eb7f2c88293d6c55deedfa3523116a579a7d5d0ce103 SHA512 f51cee6d6aa588691ddb238340c9c0f3d4072dcff7266ab1ec799aaacc07dfb4807926c6df4e018398f18a2fa99f391af0687a94028ad73f89d22c32dc2fcde0 WHIRLPOOL 42f34f4012850e80fc0aeb4a1ada901ba13fa4d4a61b92388187509baba73630bbf0ae82f5c43c32ba46733c4f1230abd59ee0dd7b504ca3d5fe5babeed38044
+EBUILD xen-4.2.0-r2.ebuild 4142 SHA256 35ae7f36295a96970486e0c74bfaed58745e37c0be5ac4ea954ca42e3645b241 SHA512 c222f5eef702e398e4e890300a1e50153fc312f7b4d9b14988b996a01de6136faa1cf82f5ae24e368563ac795860397ef8e08ed0bba623d802b7d4bb39015d98 WHIRLPOOL dbd2192f9f3c5659271723923c7d60a8d196dd887bf76e2f0725548cb99e5c753f63f1c13dc894c968f8cceb4914011ab226ccdd63d297922c72df655582dc73
 EBUILD xen-4.2.1-r1.ebuild 3305 SHA256 9086561438e45f57aa191812aeaa1e6e2bc83ad2cbc2427be277f1bb619416d8 SHA512 ff50c7e57000706d5eb1d27c9dc982263f574fd70223f697cdaed73aac5e4ac69a0d686cf726d329a1ce666e873b50ccc9b1e54f9e236d9640a2d89f8708cff2 WHIRLPOOL edcf3161dee1dea5c512d57bdd628ee58417836b5c8263f854faee7022f35d5b1ad5482151576ba8e09f678b868713564c5fffc291c8b88fdada07edec07d83b
-EBUILD xen-4.2.1-r2.ebuild 3674 SHA256 7403e474365ffe49019921a90c75cf008bac81ba1af86089f1a43b8d66443dad SHA512 6fd0c4aa10557cd0b7aca44d0d2f17b1fcad07ed70ef05e17ccb11d653c4dbb0aae39598f8236e5c2f56ea42df9cc3df431213327114b4b00efe0e7333418913 WHIRLPOOL f165c5e5cf8167d14a8cbf90b508456e9dd6e600991eff408bea1b02170f2126f393d57391dae7a4f29f244cf72f6281925e6bea6318ed762afe392be3daac93
-MISC ChangeLog 19323 SHA256 383504758af84983f0072bc1a49929449f4751c8005eb291388451732529dcac SHA512 94bae701c102212c8e2f8de776c280efb696170af8ed20d6deeb946db3efca5d8e2a980f0594ef4d95a2b5c6e9f762a78616900b58e2b0f8d04dabbee80bb234 WHIRLPOOL 6fca129c6512be1f75f07fb8e8645203f9bda560f58f7f64d4eaff420be496763692551c838b3953deda1fe5e074f8f2264fece53698e2b1e7ebbe64547295e0
+EBUILD xen-4.2.1-r2.ebuild 3687 SHA256 aaf3d4123dcb50ef643cde5673781858c9143dd67f47236252e301bc3a9b3ecc SHA512 d17ebd63c1e8e2653b5fd6bc771bfbddcda29a62fdba518cb2e2b111a6499ea7c46394da9f20ff8f181ed0d8e387caa341379aea8047beff667b4e223f391342 WHIRLPOOL 44a8cb998741ae97c2ccbcd7f3a570dc17533a41ea99c48acb9597c498c14664a6baa605629598470108774a27ebffb7c0e0da32f5c842106f5c7c5ab71fdfbe
+MISC ChangeLog 19509 SHA256 402116b17dde1629fe0abafcc6a07e159efc86b02789e5ef43d815d1b972fc49 SHA512 14c715ae118f1c0057dffb3094c28abdf4b74ad517b5c151c6d051af3bb0f0a03fde9b677b907332b4ac5ea1302b64eac0afc4ca71d15989dfffc0c0e571c64f WHIRLPOOL 13bd27b6e849437742017728ad8fdd298953f03df425587c2244782aff19dacdbd35eca1615a47a74f1a1f661c36dc5edf2d3481ee7c1a9eb352b5e070214925
 MISC metadata.xml 572 SHA256 0f510aa5a7261b30e5eff6961fa9dd95b19db63e0eea93cfad1d47460318ba07 SHA512 8bbca8d353aa3b556783bddd4822b97c0372b169edb89ff2907a00895e014ff9dba9e8efccf04f45de8a69ce63849505455e9735c224700d1ebf93aa3f097ac5 WHIRLPOOL 1f5517720776198868cf5a0165b9daf2ee48187bde4ad4d86533c65898da608bde779289df7ef83eaf076e0ce284607fc21f61fc3ca0baaf86873ca400491d0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEroscACgkQso7CE7gHKw14OwCgvGYnUM5/oWdaWAQUyvoBJ+kv
-lVQAn0d72VIUn5GBnWMihS4YCnhSFPMd
-=6Xfn
+iEYEAREIAAYFAlEtvdsACgkQso7CE7gHKw1BswCg2Mu5j5Owi7aNpn3ETPY8AOII
+eo0An3ftpsRiPEdAj+prPDmi9qIimeuV
+=kdFp
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-4.2.0-r2.ebuild b/app-emulation/xen/xen-4.2.0-r2.ebuild
index 7faf9c8ab6eb..ef1cd9d8d6d0 100644
--- a/app-emulation/xen/xen-4.2.0-r2.ebuild
+++ b/app-emulation/xen/xen-4.2.0-r2.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/xen-4.2.0-r2.ebuild,v 1.2 2013/02/25 17:43:21 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r2.ebuild,v 1.3 2013/02/27 08:03:21 idella4 Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="custom-cflags debug efi flask pae xsm"
 
-RDEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )"
+DEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )"
 PDEPEND="~app-emulation/xen-tools-${PV}[${PYTHON_USEDEP}]"
 
 RESTRICT="test"
@@ -122,8 +122,11 @@ src_install() {
 	local myopt
 	use debug && myopt="${myopt} debug=y"
 	use pae && myopt="${myopt} pae=y"
+
 	#The 'make install' doesn't 'mkdir -p' the subdirs
-	use efi && mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
 
 	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
 }
diff --git a/app-emulation/xen/xen-4.2.1-r2.ebuild b/app-emulation/xen/xen-4.2.1-r2.ebuild
index cd38c21d105c..545f9a68724d 100644
--- a/app-emulation/xen/xen-4.2.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.2.1-r2.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/xen-4.2.1-r2.ebuild,v 1.1 2013/02/24 08:23:59 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r2.ebuild,v 1.2 2013/02/27 08:03:21 idella4 Exp $
 
 EAPI=5
 
@@ -113,8 +113,11 @@ src_install() {
 	local myopt
 	use debug && myopt="${myopt} debug=y"
 	use pae && myopt="${myopt} pae=y"
+
 	#The 'make install' doesn't 'mkdir -p' the subdirs
-	use efi && mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
 
 	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
 }