version bump; fix file collision in >=0.6.0, bug #515488, patch by Christian Ruppert (idl0r)

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)

4 files changed, 74 insertions, 10 deletions

diff --git a/app-emulation/virt-viewer/ChangeLog b/app-emulation/virt-viewer/ChangeLog
index f10c63bf4638..91d9e7f61f87 100644
--- a/app-emulation/virt-viewer/ChangeLog
+++ b/app-emulation/virt-viewer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virt-viewer
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.29 2014/09/21 15:25:47 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.30 2015/01/19 17:38:32 tamiko Exp $
+
+*virt-viewer-2.0 (19 Jan 2015)
+
+  19 Jan 2015; Matthias Maier <tamiko@gentoo.org> +virt-viewer-2.0.ebuild,
+  virt-viewer-0.6.0.ebuild, virt-viewer-1.0.ebuild:
+  version bump; fix file collision in >=0.6.0, bug #515488, patch by Christian
+  Ruppert (idl0r)
 
 *virt-viewer-1.0 (21 Sep 2014)
 
diff --git a/app-emulation/virt-viewer/virt-viewer-0.6.0.ebuild b/app-emulation/virt-viewer/virt-viewer-0.6.0.ebuild
index 3802612461d9..a17b9b988807 100644
--- a/app-emulation/virt-viewer/virt-viewer-0.6.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.6.0.ebuild,v 1.2 2014/06/13 13:51:41 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.6.0.ebuild,v 1.3 2015/01/19 17:38:32 tamiko Exp $
 
 EAPI=5
-inherit eutils gnome2
+inherit eutils gnome2 fdo-mime
 
 DESCRIPTION="Graphical console client for connecting to virtual machines"
 HOMEPAGE="http://virt-manager.org/"
@@ -29,7 +29,7 @@ REQUIRED_USE="|| ( spice vnc )"
 
 pkg_setup() {
 	G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
-	G2CONF="${G2CONF} --with-gtk=3.0 --without-ovirt"
+	G2CONF="${G2CONF} --with-gtk=3.0 --without-ovirt --disable-update-mimedb"
 }
 
 src_prepare() {
@@ -44,3 +44,7 @@ src_test() {
 src_install() {
 	default
 }
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
diff --git a/app-emulation/virt-viewer/virt-viewer-1.0.ebuild b/app-emulation/virt-viewer/virt-viewer-1.0.ebuild
index 39de7028a2e5..b1cdea8c2061 100644
--- a/app-emulation/virt-viewer/virt-viewer-1.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-1.0.ebuild,v 1.1 2014/09/21 15:25:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-1.0.ebuild,v 1.2 2015/01/19 17:38:32 tamiko Exp $
 
 EAPI=5
-inherit eutils gnome2
+inherit eutils gnome2 fdo-mime
 
 DESCRIPTION="Graphical console client for connecting to virtual machines"
 HOMEPAGE="http://virt-manager.org/"
@@ -29,7 +29,7 @@ REQUIRED_USE="|| ( spice vnc )"
 
 pkg_setup() {
 	G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
-	G2CONF="${G2CONF} --with-gtk=3.0 --without-ovirt"
+	G2CONF="${G2CONF} --with-gtk=3.0 --without-ovirt --disable-update-mimedb"
 }
 
 src_prepare() {
@@ -43,3 +43,7 @@ src_test() {
 src_install() {
 	default
 }
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
diff --git a/app-emulation/virt-viewer/virt-viewer-2.0.ebuild b/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
new file mode 100644
index 000000000000..048df10164e8
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-2.0.ebuild,v 1.1 2015/01/19 17:38:32 tamiko Exp $
+
+EAPI=5
+inherit eutils gnome2 fdo-mime
+
+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"
+IUSE="sasl +spice +vnc"
+
+RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
+	>=dev-libs/libxml2-2.6
+	x11-libs/gtk+:3
+	spice? ( >=net-misc/spice-gtk-0.22[sasl?,gtk3] )
+	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	spice? ( >=app-emulation/spice-protocol-0.10.1 )"
+
+REQUIRED_USE="|| ( spice vnc )"
+
+pkg_setup() {
+	G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
+	G2CONF="${G2CONF} --with-gtk=3.0 --without-ovirt --disable-update-mimedb"
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}