Version bump; remove old; fix live ebuild (bug #360081).

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

7 files changed, 29 insertions, 207 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 4b4a36b5471c..8aa6d45b5fab 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.42 2011/03/23 06:32:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.43 2011/03/28 08:40:20 flameeyes Exp $
+
+*virt-manager-0.8.7 (28 Mar 2011)
+
+  28 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -virt-manager-0.8.3.ebuild, -virt-manager-0.8.4-r1.ebuild,
+  -virt-manager-0.8.4-r2.ebuild, -virt-manager-0.8.5.ebuild,
+  virt-manager-0.8.6.ebuild, +virt-manager-0.8.7.ebuild,
+  virt-manager-9999.ebuild:
+  Version bump; remove old; fix live ebuild (bug #360081).
 
   23 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
   virt-manager-0.8.3.ebuild, virt-manager-0.8.4-r1.ebuild,
diff --git a/app-emulation/virt-manager/virt-manager-0.8.3.ebuild b/app-emulation/virt-manager/virt-manager-0.8.3.ebuild
deleted file mode 100644
index 0fe938ae054f..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.8.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.3.ebuild,v 1.3 2011/03/23 06:32:27 ssuominen Exp $
-
-EAPI=2
-
-# Stop gnome2.eclass from doing stuff on USE=debug
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
-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="gnome-keyring policykit"
-RDEPEND=">=dev-lang/python-2.4.0
-	>=dev-python/pygtk-1.99.12
-	>=app-emulation/libvirt-0.4.5[python]
-	>=dev-libs/libxml2-2.6.23[python]
-	>=app-emulation/virtinst-0.500.2
-	>=gnome-base/librsvg-2
-	>=x11-libs/vte-0.12.2:0[python]
-	>=net-libs/gtk-vnc-0.3.4[python]
-	>=dev-python/dbus-python-0.61
-	>=dev-python/gconf-python-1.99.11
-	dev-python/libgnome-python
-	dev-python/urlgrabber
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	policykit? ( sys-auth/polkit )"
-DEPEND="${RDEPEND}
-	app-text/rarian"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.2-ssh-tunnel-shutdown.patch
-}
diff --git a/app-emulation/virt-manager/virt-manager-0.8.4-r1.ebuild b/app-emulation/virt-manager/virt-manager-0.8.4-r1.ebuild
deleted file mode 100644
index 2012719bc4aa..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.4-r1.ebuild,v 1.3 2011/03/23 06:32:27 ssuominen Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.4"
-
-# Stop gnome2.eclass from doing stuff on USE=debug
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
-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="gnome-keyring policykit"
-RDEPEND=">=dev-python/pygtk-1.99.12
-	>=app-emulation/libvirt-0.7.0[python]
-	>=dev-libs/libxml2-2.6.23[python]
-	>=app-emulation/virtinst-0.500.3
-	>=gnome-base/librsvg-2
-	>=x11-libs/vte-0.12.2:0[python]
-	>=net-libs/gtk-vnc-0.3.8[python]
-	>=dev-python/dbus-python-0.61
-	>=dev-python/gconf-python-1.99.11
-	dev-python/urlgrabber
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	policykit? ( sys-auth/polkit )"
-DEPEND="${RDEPEND}
-	app-text/rarian"
-
-src_prepare() {
-	sed -e "s/python/python2/" -i src/virt-manager.in || \
-		die "python2 update failed"
-
-	epatch "${FILESDIR}"/${P}-customize-dialog-xmlparsedoc.patch
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/virt-manager/pixmaps/
-	doins "${S}"/pixmaps/*.png
-	doins "${S}"/pixmaps/*.svg
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/16x16/actions/
-	doins "${S}"/pixmaps/hicolor/16x16/actions/*.png
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/22x22/actions/
-	doins "${S}"/pixmaps/hicolor/22x22/actions/*.png
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/24x24/actions/
-	doins "${S}"/pixmaps/hicolor/24x24/actions/*.png
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/32x32/actions/
-	doins "${S}"/pixmaps/hicolor/32x32/actions/*.png
-}
diff --git a/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild b/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild
deleted file mode 100644
index e09d27fce7a2..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.4-r2.ebuild,v 1.3 2011/03/23 06:32:27 ssuominen Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.4"
-
-# Stop gnome2.eclass from doing stuff on USE=debug
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
-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="gnome-keyring policykit sasl"
-RDEPEND=">=dev-python/pygtk-1.99.12
-	>=app-emulation/libvirt-0.7.0[python,sasl?]
-	>=dev-libs/libxml2-2.6.23[python]
-	>=app-emulation/virtinst-0.500.3
-	>=gnome-base/librsvg-2
-	>=x11-libs/vte-0.12.2:0[python]
-	>=net-libs/gtk-vnc-0.3.8[python,sasl?]
-	>=dev-python/dbus-python-0.61
-	>=dev-python/gconf-python-1.99.11
-	dev-python/urlgrabber
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	policykit? ( sys-auth/polkit )"
-DEPEND="${RDEPEND}
-	app-text/rarian"
-
-src_prepare() {
-	sed -e "s/python/python2/" -i src/virt-manager.in || \
-		die "python2 update failed"
-
-	epatch "${FILESDIR}"/${P}-customize-dialog-xmlparsedoc.patch
-	epatch "${FILESDIR}"/${P}-default-keyring.patch
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/virt-manager/pixmaps/
-	doins "${S}"/pixmaps/*.png
-	doins "${S}"/pixmaps/*.svg
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/16x16/actions/
-	doins "${S}"/pixmaps/hicolor/16x16/actions/*.png
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/22x22/actions/
-	doins "${S}"/pixmaps/hicolor/22x22/actions/*.png
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/24x24/actions/
-	doins "${S}"/pixmaps/hicolor/24x24/actions/*.png
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/32x32/actions/
-	doins "${S}"/pixmaps/hicolor/32x32/actions/*.png
-}
diff --git a/app-emulation/virt-manager/virt-manager-0.8.6.ebuild b/app-emulation/virt-manager/virt-manager-0.8.6.ebuild
index e2cbdff4352c..4908ac3d4f30 100644
--- a/app-emulation/virt-manager/virt-manager-0.8.6.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.8.6.ebuild
@@ -1,16 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.6.ebuild,v 1.3 2011/03/23 06:32:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.6.ebuild,v 1.4 2011/03/28 08:40:20 flameeyes Exp $
 
 BACKPORTS=1
 
 EAPI=2
 
-if [[ ${PV} = *9999* ]]; then
-	EHG_REPO_URI="http://hg.fedorahosted.org/hg/virt-manager"
-	HG_ECLASS="mercurial autotools"
-fi
-
 PYTHON_DEPEND="2:2.4"
 
 # Stop gnome2.eclass from doing stuff on USE=debug
@@ -18,16 +13,10 @@ GCONF_DEBUG="no"
 
 inherit eutils gnome2 python ${HG_ECLASS}
 
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-	VIRTINSTDEP=">=app-emulation/virtinst-9999"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
-		${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="~amd64 ~x86"
-	VIRTINSTDEP=">=app-emulation/virtinst-0.500.5"
-fi
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
+	${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
+KEYWORDS="~amd64 ~x86"
+VIRTINSTDEP=">=app-emulation/virtinst-0.500.5"
 
 DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
 HOMEPAGE="http://virt-manager.org/"
@@ -58,19 +47,6 @@ src_prepare() {
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
 
-	if [[ ${PV} = *9999* ]]; then
-		# virt-manager's autogen.sh touches this and eautoreconf fails
-		# unless we do this
-		touch config.rpath
-
-		rm -f config.status
-		intltoolize --automake --copy --force
-		perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in
-		perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \
-			po/Makefile.in.i
-		eautoreconf
-	fi
-
 	gnome2_src_prepare
 }
 
diff --git a/app-emulation/virt-manager/virt-manager-0.8.5.ebuild b/app-emulation/virt-manager/virt-manager-0.8.7.ebuild
index 9efbd6ba5966..af48aa5d2eb8 100644
--- a/app-emulation/virt-manager/virt-manager-0.8.5.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.8.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.5.ebuild,v 1.4 2011/03/23 06:32:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.7.ebuild,v 1.1 2011/03/28 08:40:20 flameeyes Exp $
 
-BACKPORTS=1
+#BACKPORTS=
 
 EAPI=2
 
@@ -11,20 +11,22 @@ PYTHON_DEPEND="2:2.4"
 # Stop gnome2.eclass from doing stuff on USE=debug
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 python
+inherit eutils gnome2 python ${HG_ECLASS}
 
-DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
-HOMEPAGE="http://virt-manager.org/"
 SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
 	${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
+KEYWORDS="~amd64 ~x86"
+VIRTINSTDEP=">=app-emulation/virtinst-0.500.6"
+
+DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
+HOMEPAGE="http://virt-manager.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="gnome-keyring policykit sasl"
 RDEPEND=">=dev-python/pygtk-1.99.12
 	>=app-emulation/libvirt-0.7.0[python,sasl?]
 	>=dev-libs/libxml2-2.6.23[python]
-	>=app-emulation/virtinst-0.500.4
+	${VIRTINSTDEP}
 	>=gnome-base/librsvg-2
 	>=x11-libs/vte-0.12.2:0[python]
 	>=net-libs/gtk-vnc-0.3.8[python,sasl?]
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 5e4e79065dd9..b5db9de91a58 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.3 2011/03/23 06:32:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.4 2011/03/28 08:40:20 flameeyes Exp $
 
 #BACKPORTS=1
 
 EAPI=2
 
 if [[ ${PV} = *9999* ]]; then
-	EHG_REPO_URI="http://hg.fedorahosted.org/hg/virt-manager"
-	HG_ECLASS="mercurial autotools"
+	EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git"
+	GIT_ECLASS="git autotools"
 fi
 
 PYTHON_DEPEND="2:2.4"
@@ -16,7 +16,7 @@ PYTHON_DEPEND="2:2.4"
 # Stop gnome2.eclass from doing stuff on USE=debug
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 python ${HG_ECLASS}
+inherit eutils gnome2 python ${GIT_ECLASS}
 
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
@@ -26,7 +26,7 @@ else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
 		${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
 	KEYWORDS="~amd64 ~x86"
-	VIRTINSTDEP=">=app-emulation/virtinst-0.500.4"
+	VIRTINSTDEP=">=app-emulation/virtinst-0.500.6"
 fi
 
 DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"