Bump to eapi2 for usedeps, fixing depends for use=doc, closes #199764

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

3 files changed, 13 insertions, 25 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 43bce105ea3b..a30e279ec66f 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.44 2009/04/26 13:14:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.45 2009/04/27 15:44:54 patrick Exp $
+
+  27 Apr 2009; Patrick Lauer <patrick@gentoo.org> xen-tools-3.3.1:
+  Bump to eapi2 for usedeps, fixing depends for use=doc, closes #199764
 
 *xen-tools-3.3.1 (26 Apr 2009)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 5697031af7c5..15cf68e9f6c8 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -21,6 +21,6 @@ EBUILD xen-tools-3.1.3-r1.ebuild 6763 RMD160 6c6e3ebcd62eb7d08ef86f93aa18f0ae1da
 EBUILD xen-tools-3.1.3.ebuild 6657 RMD160 908c386349e533e85e7ed3aaf30c21960da26d69 SHA1 240d5ee186ca824ea9ea8a727c7dc1460c4acd84 SHA256 f77bde05f6bfb6fb1b111b51837eec57872b0533219ddb300843aeb1733ff414
 EBUILD xen-tools-3.2.1.ebuild 6831 RMD160 5c59bc41afbab20a9cd6d42aa48bbfc8bb71d187 SHA1 3fdec239a85be84b6f321f42ece5b9b7c01ab555 SHA256 60a352407c7e737ab278cbef4ea78091de26ee54e1d56ad09259d65c4bf1ce6e
 EBUILD xen-tools-3.3.0.ebuild 7817 RMD160 0e6ac767cb100959c3274a038bef0ce5c25a0428 SHA1 0eb2b151306888302ed5083abd6954bd4a2bb081 SHA256 5328c8d3b388fc4d2ea5a42f73db6aab4191dd339abfbccb3cedfafc2e381cdc
-EBUILD xen-tools-3.3.1.ebuild 7687 RMD160 fb3c8af37390de4f26c6911fffa6d46f5a5717a7 SHA1 299227cea1c25c7ec709eddc19ea59481d42b1a6 SHA256 23f4b8c6638f1fb8b67e5bea6d4c7a09150af81c723450ba08cd4c5fa85a6442
-MISC ChangeLog 12987 RMD160 f948f24a9bd63e1b12cd69527cb30eeb133887b3 SHA1 13acaafef91a1279cabed6bfd6ba46cd022c51d3 SHA256 864259fa0fd23122b672c0aa830d011f4d1781af874c50010ce01239a0dff19c
+EBUILD xen-tools-3.3.1.ebuild 6990 RMD160 dfdfb14dabe295079f1b523264a239f7727da6d2 SHA1 47a383147bb0f33afbe40c54036fef5ab4b2314d SHA256 3c8b6a925de86b2fe439438eaba8d47d3cce79adffe00d9ce6cb1146b341e2d1
+MISC ChangeLog 13127 RMD160 8921b38a48288966cde2cb99c568cc4fb7a9b049 SHA1 b94bf4b402a3420126caaac224c4f78fb7a7eaf8 SHA256 28682a7a36145a77886fe8b7681a12313e79bba9f8bdced459b7646343459ec0
 MISC metadata.xml 673 RMD160 021c0a8f46b9d3025871c246aa7611904be2e2f9 SHA1 3af764dc6af79bcda8611546d4fb8693f784fa0c SHA256 137fa204b41b1b552deff15a977df2a3acde6f263c5034f75735de4f80028609
diff --git a/app-emulation/xen-tools/xen-tools-3.3.1.ebuild b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
index 5b9223818b24..afd53547b22a 100644
--- a/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.3.1.ebuild,v 1.1 2009/04/26 13:14:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.3.1.ebuild,v 1.2 2009/04/27 15:44:54 patrick Exp $
+
+EAPI="2"
 
 inherit flag-o-matic eutils multilib python
 
@@ -17,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
 
-CDEPEND="dev-lang/python
+CDEPEND="dev-lang/python[ncurses,threads]
 	sys-libs/zlib
 	hvm? ( media-libs/libsdl )
 	acm? ( dev-libs/libxml2 )
@@ -27,10 +29,12 @@ CDEPEND="dev-lang/python
 DEPEND="${CDEPEND}
 	sys-devel/gcc
 	dev-lang/perl
+	dev-lang/python
 	app-misc/pax-utils
 	doc? (
 		app-doc/doxygen
-		dev-tex/latex2html
+		dev-tex/latex2html[png,gif]
+		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 		media-gfx/graphviz
 	)
@@ -79,25 +83,6 @@ pkg_setup() {
 		fi
 	fi
 
-	if use doc && ! built_with_use -o dev-tex/latex2html png gif; then
-		# die early instead of later
-		eerror "USE=doc requires latex2html with image support. Please add"
-		eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html"
-		die "latex2html missing both png and gif flags"
-	fi
-
-	if use pygrub && ! built_with_use dev-lang/python ncurses; then
-		eerror "USE=pygrub requires python to be built with ncurses support. Please add"
-		eerror "'ncurses' to your use flags and re-emerge python"
-		die "python is missing ncurses flags"
-	fi
-
-	if ! built_with_use dev-lang/python threads; then
-		eerror "Python is required to be built with threading support. Please add"
-		eerror "'threads' to your use flags and re-emerge python"
-		die "python is missing threads flags"
-	fi
-
 #	use vtpm    && export "VTPM_TOOLS=y"
 	use api     && export "LIBXENAPI_BINDINGS=y"
 	use acm     && export "ACM_SECURITY=y"