Version bump. Switch to REQUIRED_USE instead of a pkg_pretend check.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 53 insertions, 10 deletions

diff --git a/app-emulation/virt-viewer/ChangeLog b/app-emulation/virt-viewer/ChangeLog
index 453db79ba577..d76d81521baa 100644
--- a/app-emulation/virt-viewer/ChangeLog
+++ b/app-emulation/virt-viewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virt-viewer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.13 2012/01/19 20:20:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.14 2012/03/11 00:50:09 cardoe Exp $
+
+*virt-viewer-0.5.2 (10 Mar 2012)
+
+  10 Mar 2012; Doug Goldstein <cardoe@gentoo.org> virt-viewer-0.4.2.ebuild,
+  +virt-viewer-0.5.2.ebuild:
+  Version bump. Switch to REQUIRED_USE instead of a pkg_pretend check.
 
   19 Jan 2012; Doug Goldstein <cardoe@gentoo.org> virt-viewer-0.4.2.ebuild:
   USE=nsplugin relies on GTK+ 2.0, but when someone has USE=gtk3, we won't pull
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 8c8a25cd9c2c..43759213d3c4 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,4 +1,6 @@
 DIST virt-viewer-0.4.2.tar.gz 442244 RMD160 f1094a374b0d808af77ba992fd12ba38c25a0623 SHA1 3b1d253c3c5f9cc89786e601e40a6ac72e52d4ee SHA256 32057e115ee53d9894af05ac4659893dc7e6ff9efba8d74999147b1bfda1439c
-EBUILD virt-viewer-0.4.2.ebuild 1325 RMD160 6a32be7093ca8396f431e66e371caf0a228d666e SHA1 79f6cf91680f8f8e7598e4ef66cfec6830661915 SHA256 828ff77cd4c5fb10781ca48edd818157368234518543418842fbb48337960b77
-MISC ChangeLog 2320 RMD160 b011e88b388712da47f23a2e271ade4370f9b75f SHA1 53b3b64b4812fe6334fcd9aab05196aafda32ee9 SHA256 d77c438b62a6914d959de43e64de209337d4252990623e5451e5070cee67ff9e
+DIST virt-viewer-0.5.2.tar.gz 583436 RMD160 4371ca8e6d95c38c223299c2a8175c2f5d135fc0 SHA1 634667d56945307046ff378843975bbd5290c4d1 SHA256 e7f09b5de988fd3c81568d05d2b5db97c620b547ec8f92eab8e6a88604a18009
+EBUILD virt-viewer-0.4.2.ebuild 1235 RMD160 c27687836b4652491f58fbbbb70d7edc158c15bc SHA1 8904e619e7b518685734e10bd337c61f19f3ed7a SHA256 33767158b76135a4bf2fccfcbb3dc766aa3606fb0d26ffae4f7fb9a28c6992e2
+EBUILD virt-viewer-0.5.2.ebuild 1237 RMD160 eb3e700d8d353d36cdb5693fc9b6147e700e80ee SHA1 42f517ae89429ccd0c8a836e49bb7dec2e6d6469 SHA256 de15b7e4a43c331a33e76fcf3dc2e7806e36157a98414abae1617bf1927c0f4e
+MISC ChangeLog 2531 RMD160 41c51baa680e9af6013624c38382e20866c1a3d9 SHA1 91c00cc9ed2b33a227f6139a8872978a3558606a SHA256 0579c5961e654f472263e606c4785ac1bc2e2b3843f66a705573972d41c781c9
 MISC metadata.xml 458 RMD160 b2da4655fe9f03fa5a2c9d74b6ab64b51002b3d2 SHA1 5e084322b3ac4b50f622e7a7155c3a6856818693 SHA256 8ed1c7a57660494a298c83bfd496954a3676b992317363e2cb5f2a4aec0b9345
diff --git a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
index 2d66fb47ece3..d7e2e426ffe1 100644
--- a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v 1.3 2012/01/19 20:20:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v 1.4 2012/03/11 00:50:09 cardoe Exp $
 
 EAPI=4
 
@@ -26,12 +26,9 @@ RDEPEND=">=app-emulation/libvirt-0.6.0
 	vnc? ( >=net-libs/gtk-vnc-0.4.3 )"
 DEPEND="${RDEPEND}"
 
-pkg_pretend() {
-	if ! use spice && ! use vnc; then
-		eerror "You must have USE=vnc or USE=spice enabled."
-		die "You must have USE=vnc or USE=spice enabled."
-	fi
-}
+REQUIRED_USE="|| ( spice vnc )
+	nsplugin? ( !gtk3 )
+	gtk3? ( !nsplugin )"
 
 pkg_setup() {
 	G2CONF="$(use_enable nsplugin plugin) $(use_with spice spice-gtk)"
diff --git a/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild
new file mode 100644
index 000000000000..c11ffeb87363
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild,v 1.1 2012/03/11 00:50:09 cardoe Exp $
+
+EAPI=4
+
+inherit eutils gnome2
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="http://virt-manager.org/"
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3 nsplugin sasl +spice +vnc"
+RDEPEND=">=app-emulation/libvirt-0.9.7
+	>=dev-libs/libxml2-2.6.0:2
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.18.0:2
+			>=gnome-base/libglade-2.6.0:2.0 )
+	nsplugin? ( >=dev-libs/nspr-4.0.0
+				>=net-libs/xulrunner-1.9.1:1.9
+				>=x11-libs/gtk+-2.18.0:2
+				>=gnome-base/libglade-2.6.0:2.0 )
+	spice? ( >=net-misc/spice-gtk-0.11[sasl?,gtk3?] )
+	vnc? ( >=net-libs/gtk-vnc-0.4.3 )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( spice vnc )
+	nsplugin? ( !gtk3 )
+	gtk3? ( !nsplugin )"
+
+pkg_setup() {
+	G2CONF="$(use_enable nsplugin plugin) $(use_with spice spice-gtk)"
+	G2CONF="${G2CONF} $(use_with vnc gtk-vnc)"
+	use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0"
+	use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0"
+}