Die if both x86 and amd64 are set

Package-Manager: portage-2.1.2.11

4 files changed, 36 insertions, 21 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 668ae18c23c0..afd8cfe69418 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.47 2007/07/10 17:01:29 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.48 2007/08/27 17:19:12 marineam Exp $
+
+  27 Aug 2007; Michael Marineau <marineam@gentoo.org> xen-3.0.4_p1.ebuild,
+  xen-3.1.0.ebuild:
+  Die if both x86 and amd64 are set in USE.
+
+*xen-3.1.0 (24 Aug 2007)
+
+  24 Aug 2007; Michael Marineau <marineam@gentoo.org>
+  -xen-3.0.2.ebuild, +xen-3.1.0.ebuild:
+  Copy Xen 3.1.0 related ebuilds over from the Xen project overlay.
+  Remove Xen 3.0.2.
 
   10 Jul 2007; Michael Marineau <marineam@gentoo.org> xen-3.0.4_p1.ebuild:
   Fix building with --as-needed
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 20971cebe2de..fe12ac8a06a4 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb
 DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7
-EBUILD xen-3.0.4_p1.ebuild 2465 RMD160 689d68b66774b442ea62c87053206a8619430ea7 SHA1 0f51dc5db9cc244ebe1bc781622606d5516908b7 SHA256 d44ef5e57dd8113302328701eea10bc17e67077be884f0f438861ebcd80afd5d
-MD5 199692e3d29f26498ec89fde9b3cc92d xen-3.0.4_p1.ebuild 2465
-RMD160 689d68b66774b442ea62c87053206a8619430ea7 xen-3.0.4_p1.ebuild 2465
-SHA256 d44ef5e57dd8113302328701eea10bc17e67077be884f0f438861ebcd80afd5d xen-3.0.4_p1.ebuild 2465
-EBUILD xen-3.1.0.ebuild 2425 RMD160 37892a08aa54c487c5913a58959bc06aed10c0f7 SHA1 537fb5357fbf1126c0cf61bcf2411a785ce7aa1c SHA256 ba58f95d9259befa0a565dc0cde5a50eb294b0fc58dca9228529497ace8becbe
-MD5 84c293705f4f4c8da00552a2412148dd xen-3.1.0.ebuild 2425
-RMD160 37892a08aa54c487c5913a58959bc06aed10c0f7 xen-3.1.0.ebuild 2425
-SHA256 ba58f95d9259befa0a565dc0cde5a50eb294b0fc58dca9228529497ace8becbe xen-3.1.0.ebuild 2425
-MISC ChangeLog 7679 RMD160 cc3fcb28cb55464cb66bbad2b5c9f7c16f71ba04 SHA1 d66af9575d47d3d3eb0553ccddd7753e9eb2d283 SHA256 d9e67566a98ec6fa7e9fe1d1c361daf0c7c8b9936fd3261cb1454df26b6f1d0b
-MD5 80f94d2230cf42d7b0bdbf3356ca87d9 ChangeLog 7679
-RMD160 cc3fcb28cb55464cb66bbad2b5c9f7c16f71ba04 ChangeLog 7679
-SHA256 d9e67566a98ec6fa7e9fe1d1c361daf0c7c8b9936fd3261cb1454df26b6f1d0b ChangeLog 7679
+EBUILD xen-3.0.4_p1.ebuild 2565 RMD160 d0d79e91f517a6454a4bdf0d50fbc2b9233b119e SHA1 190e7dd5fe0e3e1cfc8adb059d23b4c115407617 SHA256 5f1a56971c8aad3c15769c32d12fb34916bc89cfb7684cd6b07aed6c597049aa
+MD5 bacccc2bd7cb9fb6878cba5d4c8ab90a xen-3.0.4_p1.ebuild 2565
+RMD160 d0d79e91f517a6454a4bdf0d50fbc2b9233b119e xen-3.0.4_p1.ebuild 2565
+SHA256 5f1a56971c8aad3c15769c32d12fb34916bc89cfb7684cd6b07aed6c597049aa xen-3.0.4_p1.ebuild 2565
+EBUILD xen-3.1.0.ebuild 2525 RMD160 6a63f2fdbf31a852a7a93089c4a7372d3e61c5b1 SHA1 b5a8775005162bd615c12d8339268b2fa663c2d0 SHA256 79fd81652ce18349a9694b99a9cc91d3dc3bd04715579c2f26be2137907120ca
+MD5 fa2916292bb5dd459eb217e8d577bdf9 xen-3.1.0.ebuild 2525
+RMD160 6a63f2fdbf31a852a7a93089c4a7372d3e61c5b1 xen-3.1.0.ebuild 2525
+SHA256 79fd81652ce18349a9694b99a9cc91d3dc3bd04715579c2f26be2137907120ca xen-3.1.0.ebuild 2525
+MISC ChangeLog 8028 RMD160 d0445f53cd5cf2f24ebd166fcfff1d5ac051b051 SHA1 fe6ff2a4e667db2bfbbcb0f5197eaa1bf2c29bee SHA256 1bddc9689cf538f52d42af76e612a9a585606cfadc355fd3ad55df01059d1417
+MD5 2f4c1e78c3853c3fde64a6f25f53ba66 ChangeLog 8028
+RMD160 d0445f53cd5cf2f24ebd166fcfff1d5ac051b051 ChangeLog 8028
+SHA256 1bddc9689cf538f52d42af76e612a9a585606cfadc355fd3ad55df01059d1417 ChangeLog 8028
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
@@ -26,9 +26,9 @@ MD5 b2e86effae6681cbbecdbf864b193b4a files/digest-xen-3.1.0 235
 RMD160 2366b7298f0125f11d41aca0c6088c20863dbed1 files/digest-xen-3.1.0 235
 SHA256 12c130912c624791e6855ebeb932368fc8889371876db396055b02ac9a3b9892 files/digest-xen-3.1.0 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFGz2hGiP+LossGzjARAv1wAKDONB3ZXi7x9I/K2j+43MAN5IDk9QCdGTWp
-uQHSjz31o+64Uoi4cgIiZqE=
-=Ik5c
+iD8DBQFG0weZiP+LossGzjARAif/AJoDKJJUikHXhZ5EvfmMGK4XlRlYNQCePVOI
+MMvU8bz10U6liNemG1klR6g=
+=TBxy
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-3.0.4_p1.ebuild b/app-emulation/xen/xen-3.0.4_p1.ebuild
index d7a42176f0b5..7874fc418765 100644
--- a/app-emulation/xen/xen-3.0.4_p1.ebuild
+++ b/app-emulation/xen/xen-3.0.4_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.4_p1.ebuild,v 1.4 2007/07/10 17:01:29 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.4_p1.ebuild,v 1.5 2007/08/27 17:19:12 marineam Exp $
 
 inherit mount-boot flag-o-matic
 
@@ -27,7 +27,9 @@ QA_WX_LOAD="boot/xen-syms-${MY_PV/_/-}"
 
 pkg_setup() {
 	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
 			export XEN_TARGET_ARCH="x86_32"
 		elif use amd64; then
 			export XEN_TARGET_ARCH="x86_64"
diff --git a/app-emulation/xen/xen-3.1.0.ebuild b/app-emulation/xen/xen-3.1.0.ebuild
index 7b0f04236c38..dcc4d72fbaac 100644
--- a/app-emulation/xen/xen-3.1.0.ebuild
+++ b/app-emulation/xen/xen-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.1.0.ebuild,v 1.1 2007/08/24 23:22:32 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.1.0.ebuild,v 1.2 2007/08/27 17:19:12 marineam Exp $
 
 inherit mount-boot flag-o-matic
 
@@ -26,7 +26,9 @@ QA_WX_LOAD="boot/xen-syms-${PV}"
 
 pkg_setup() {
 	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
 			export XEN_TARGET_ARCH="x86_32"
 		elif use amd64; then
 			export XEN_TARGET_ARCH="x86_64"