[app-emulation/xen] Sync live ebuild with 4.1.1, drop acm since its deprecated upstream. Input from Ian Delaney aka idell4

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

5 files changed, 82 insertions, 56 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 2dab1c894683..4e20a8ffc9b0 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.78 2011/08/31 18:45:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.79 2011/09/11 14:48:15 alexxy Exp $
+
+*xen-4.1.1-r1 (11 Sep 2011)
+
+  11 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-4.1.1.ebuild,
+  +xen-4.1.1-r1.ebuild, xen-9999.ebuild, metadata.xml:
+  Sync live ebuild with 4.1.1, drop acm since its deprecated upstream. Input
+  from Ian Delaney aka idell4
 
   31 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-4.1.0.ebuild:
   Drop old version
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 6c5e2096cbf3..f5d3bd87f6b0 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -6,24 +6,24 @@ AUX xen-3.4.2-dump_registers-watchdog-fix.patch 533 RMD160 766249003d91cbec3b001
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 EBUILD xen-3.4.2-r1.ebuild 3058 RMD160 19a8baa3dbf87f4c5d4e5019f88ae4dc5ccc32e6 SHA1 aed8b48c47b8f713dbc17d67fa2d21c838f7f071 SHA256 719917cfbf0605d4951415d9f53c49262d92ba8e8921a3835aefcd549dd275bb
-EBUILD xen-4.1.1.ebuild 2921 RMD160 6cb90ad08eb16a77ea6276c17f3c70e3349ab37a SHA1 340d912e3bdf14965c8327b45b0eae6def5143d2 SHA256 b71fe444ccedadc89fb930ee1f6cd8285c9eef4ffed371fffeead53aa036f0ab
-EBUILD xen-9999.ebuild 2941 RMD160 da7c71a2e00d60367c7c652e50a8ee94c5061940 SHA1 bbae293bfe4002d4735ecca0a4299b3a8a34b0cf SHA256 5ded4f5c0d6ee5626b3824284715d0d259c35fba201844a4c022cfee0c03748c
-MISC ChangeLog 12388 RMD160 4e49982a8b1cad4fd6362b4c00db518d46df6826 SHA1 8e51ab909a49116b4a001adc8ac4a1d936ea74f8 SHA256 f86e3709433fe03361974b40d4196c6448ab44737274f72fe6f782e4fdfbb63c
-MISC metadata.xml 454 RMD160 669ebed46522166118d55bf6f6917b5902a8edb4 SHA1 76bc8f2ae3abb50dbf778d8051fcf797b19b092c SHA256 383ef9830d024c489d6edec8c78bf391821c7f1076c6b56d6e1dd2a754754279
+EBUILD xen-4.1.1-r1.ebuild 2933 RMD160 19b81de584daa8ecc01796c4d963bfb177c73eb0 SHA1 e95d8d59e785e30fd56ef2007a3c173b720e0ab1 SHA256 98fc5c43100bed8a258f4e954c7e29a51f5c6956877991f8d4a924e756a73cdd
+EBUILD xen-9999.ebuild 2929 RMD160 34b61aa566948357bed2bde59d06e38fdc21249c SHA1 5dfa8cebff2f2b9a10e40b888e151baf8afb804c SHA256 62f131e504a87ab2e05b1109325167ae9f6d9747ae90d89536d49734c7445f0e
+MISC ChangeLog 12650 RMD160 b6f963491a118e291f9313254496d4f5d2c0fb47 SHA1 b80d1bd61cd5efbbc1d85337c3bed82c2a114e1f SHA256 af90886b4c9ded1bb3a97f9fb7527e52bc0a519652ce178b75dde05303c0151b
+MISC metadata.xml 581 RMD160 d22ffb491d9dad33425b97add683dd6b8b9139e1 SHA1 649f65e9fd2ab25e32394c555a24fc0f6b59c37f SHA256 1cf2cc4bb5b5278ac75e74910607518ddd2bd6454f18325319ce1ac102fab535
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOXoFPAAoJEOf+E+/4L5LmjUIP/jL3FMO4grE/UE8uLfnciN0L
-8FUdx55PnEp6UnF9nvCCMDIwt2bOWZX3ZPVT5zv2qJ7LGzte5Dmxf3DzG40bKPh/
-1Ps047m9QSgIatBxQOL3O609DfBimxvW2Zr47VQ5LPtXb4EiLPQAGPradMHraid9
-PebHOLwQMKeiZMUdOlRCM91TRG9b9446/sJZ7hYXqo/k3mlc61OksDjqHq3jasCn
-A/IstAoJoivkLK8OG426K4KLsDRZEMUs4mg3zBOs5aLZIa1LYLL1GQn6RSLxbrID
-egPof7ngxcQzO8UOMJYTpEw1UfVGoKbR5KEMSwWMbGUzBQ6CXTi9S52dKDFemB0g
-tmX8GkY/oM4QgkFVopwtIiuCIKTrhhtG4YDJdFMNeSqKaHwHErugzM8186/LY6pt
-1u4dFNJqlIBt3roxe7lhUJX9uJaqCZYPm4nZovUs4erNTR9c8zKk5Ejwx63SrFw4
-RyFKUtGJfX/YJ6E9ZPD1TzCtcBDxbMIPTNW510k4iWDJDE4NOmr31vCFUz9kqjC1
-bLR24XW2kka/pHl+kLkFHDE5V0LVZMl7LOHXb4Vf9lDqZHxq2k6WuoN9MHDg9qVw
-aoRmLC22wOKpV9ix3nTQKAkfl6gCfXhk4lrDf9fvvgEBzDKcMd5DlXbjNLp/ete9
-pxrzZQAb9n96BuNYKvS1
-=rsVJ
+iQIcBAEBCAAGBQJObMn/AAoJEOf+E+/4L5Lm+FcQAIpww+J9CWWh1la/0iKYmHm5
+l980PIvRsIOwD7quvstAuVBOqz9gk2J+HpasA2fPs1d/diK5RYePNgM24WQJL474
+kW7pJj2/8rII+iumXk1zzmTNf10VWL67juJ5djAh0JbyYNLCIy3H6tyR/I3HLJmT
+i7IvZNeck9chPvyNsIipg2iJDFrA/ik93BbG7OStc9/AQ+9ytd3Kxlbi+rdh9Vpx
+gLtOVW6H08QXJpupz4NuB89ViRejCw/7sJWzOuQ7uNkRXnm1fC2eNYZ4RSWQB5s6
+XUN8D3Imfy/OoV2dg5dziVbokixu6xNCkFvUs3iunZDhrA88febWE5mO2K34x/uX
+/pXWSQXDj7v+rvmyWBhpkOYXadPhwvBbO6m2j3RENSdJg75bviBOPhTjpLeEaI29
+9R3vLmMOrCX0JRkUsKzFoVOjCvyUAFYD5Fmr8ZhNfJ1rPZJEhchRvO2Jkx2Y7esa
+W2ReCJ19UK2wjteQdKR/7Gprvpto4h+C+HjChnd5lvNy0o4ivNe+X74HEfBWIz6A
+430mgM0aK1jTzqSRZ9fWGFd9VHVEtrCvwwqFGq19XSbg3B+iIcY40VUXw9OIeze1
+K53pPFZ3U4BbSo9JrzpgeghCZsdUM9g6qAcWVKTvthp8D5lWs3gtzyGZirsxtP0H
+dVDZd0PrBTw31U+uuntk
+=zICb
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index 25c751f21c36..655045919f28 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xen</herd>
-<use>
-	<flag name='pae'>Enable support for PAE kernels (usually x86-32 with >4GB
-		memory)</flag>
-	<flag name='xsm'>Enable the Xen Security Modules (XSM)</flag>
-	<flag name='acm'>Enable the ACM/sHype XSM module from IBM</flag>
-	<flag name='flask'>Enable the Flask XSM module from NSA</flag>
-</use>
+	<herd>xen</herd>
+	<maintainer>
+		<email>johneed@hotmail.com</email>
+		<name>Ian Delaney aka idella4 proxy maintainer</name>
+	</maintainer>
+	<use>
+		<flag name='acm'>Enable the ACM/sHype XSM module from IBM</flag>
+		<flag name='flask'>Enable the Flask XSM module from NSA</flag>
+		<flag name='pae'>Enable support for PAE kernels (usually x86-32 with >4GB memory)</flag>
+		<flag name='xsm'>Enable the Xen Security Modules (XSM)</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/xen/xen-4.1.1.ebuild b/app-emulation/xen/xen-4.1.1-r1.ebuild
index bbe6acb9f113..00bb1ad28940 100644
--- a/app-emulation/xen/xen-4.1.1.ebuild
+++ b/app-emulation/xen/xen-4.1.1-r1.ebuild
@@ -1,19 +1,28 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1.ebuild,v 1.1 2011/07/29 22:41:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1-r1.ebuild,v 1.1 2011/09/11 14:48:15 alexxy Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit mount-boot flag-o-matic toolchain-funcs
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+fi
+
+inherit mount-boot flag-o-matic toolchain-funcs ${live_eclass}
 
 DESCRIPTION="The Xen virtual machine monitor"
 HOMEPAGE="http://xen.org/"
-SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug custom-cflags pae acm flask xsm"
+IUSE="custom-cflags debug flask pae xsm"
 
 RDEPEND="|| ( sys-boot/grub
 		sys-boot/grub-static )"
@@ -24,6 +33,10 @@ RESTRICT="test"
 # Approved by QA team in bug #144032
 QA_WX_LOAD="boot/xen-syms-${PV}"
 
+REQUIRED_USE="
+	flask? ( xsm )
+	"
+
 pkg_setup() {
 	if [[ -z ${XEN_TARGET_ARCH} ]]; then
 		if use x86 && use amd64; then
@@ -37,15 +50,11 @@ pkg_setup() {
 		fi
 	fi
 
-	if use xsm ; then
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
 		export "XSM_ENABLE=y"
-		use acm && export "ACM_SECURITY=y"
-		if use flask ; then
-			! use acm  && export "FLASK_ENABLE=y"
-			  use acm  && ewarn "Both acm and flask XSM specified, defaulting to acm."
-		fi
-	elif use acm || use flask ; then
-		ewarn "acm and flask require USE=xsm to be set, dropping use flags"
 	fi
 }
 
diff --git a/app-emulation/xen/xen-9999.ebuild b/app-emulation/xen/xen-9999.ebuild
index 5141db23ea75..8368b08eaf81 100644
--- a/app-emulation/xen/xen-9999.ebuild
+++ b/app-emulation/xen/xen-9999.ebuild
@@ -1,21 +1,28 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-9999.ebuild,v 1.3 2011/08/09 17:27:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-9999.ebuild,v 1.4 2011/09/11 14:48:15 alexxy Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit mount-boot flag-o-matic toolchain-funcs mercurial
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+fi
+
+inherit mount-boot flag-o-matic toolchain-funcs ${live_eclass}
 
 DESCRIPTION="The Xen virtual machine monitor"
 HOMEPAGE="http://xen.org/"
-REPO="xen-unstable.hg"
-EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-S="${WORKDIR}/${REPO}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug custom-cflags pae acm flask xsm"
+IUSE="custom-cflags debug flask pae xsm"
 
 RDEPEND="|| ( sys-boot/grub
 		sys-boot/grub-static )"
@@ -26,6 +33,10 @@ RESTRICT="test"
 # Approved by QA team in bug #144032
 QA_WX_LOAD="boot/xen-syms-${PV}"
 
+REQUIRED_USE="
+	flask? ( xsm )
+	"
+
 pkg_setup() {
 	if [[ -z ${XEN_TARGET_ARCH} ]]; then
 		if use x86 && use amd64; then
@@ -39,15 +50,11 @@ pkg_setup() {
 		fi
 	fi
 
-	if use xsm ; then
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
 		export "XSM_ENABLE=y"
-		use acm && export "ACM_SECURITY=y"
-		if use flask ; then
-			! use acm  && export "FLASK_ENABLE=y"
-			  use acm  && ewarn "Both acm and flask XSM specified, defaulting to acm."
-		fi
-	elif use acm || use flask ; then
-		ewarn "acm and flask require USE=xsm to be set, dropping use flags"
 	fi
 }