drop old; clean up dependency (bug #530226)

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

7 files changed, 15 insertions, 179 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index d130b7ddb44a..d28e3f943200 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.110 2014/11/02 09:22:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.111 2014/11/24 10:22:44 tamiko Exp $
+
+  24 Nov 2014; Matthias Maier <tamiko@gentoo.org>
+  -virt-manager-0.10.0-r1.ebuild, -virt-manager-0.10.0.ebuild,
+  virt-manager-0.10.0-r2.ebuild, virt-manager-1.0.1.ebuild,
+  virt-manager-1.1.0.ebuild, virt-manager-9999.ebuild:
+  drop old; clean up dependency (bug #530226)
 
   02 Nov 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded flags from metadata.xml
diff --git a/app-emulation/virt-manager/virt-manager-0.10.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-0.10.0-r1.ebuild
deleted file mode 100644
index 0201bbac232a..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 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.10.0-r1.ebuild,v 1.8 2014/04/26 08:15:47 pacho Exp $
-
-EAPI=5
-
-BACKPORTS=1cd29748
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="git://git.fedorahosted.org/virt-manager.git"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
-	${BACKPORTS+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
-	x11-libs/gtk+:3[introspection]
-	|| (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		>=app-emulation/libvirt-0.7.0[python(-),${PYTHON_USEDEP}]
-	)
-	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	gnome-base/dconf
-	>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
-	net-misc/spice-gtk[gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
-	x11-libs/vte:2.90[introspection]
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	policykit? ( sys-auth/polkit[introspection] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool"
-
-DOCS=( README NEWS )
-
-distutils-r1_python_compile() {
-	local defgraphics=
-
-	esetup.py configure \
-		--qemu-user=qemu \
-		--default-graphics=spice
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	python_fix_shebang \
-		"${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager}
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	cd "${ED}"
-	export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-}
diff --git a/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild b/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild
index 14f3fa5c92d4..4a3d7da5cded 100644
--- a/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.10.0-r2.ebuild,v 1.5 2014/08/27 07:57:29 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild,v 1.6 2014/11/24 10:22:44 tamiko Exp $
 
 EAPI=5
 
@@ -30,10 +30,7 @@ SLOT="0"
 IUSE="gnome-keyring gtk policykit sasl"
 
 RDEPEND="!app-emulation/virtinst
-	|| (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		>=app-emulation/libvirt-0.7.0[python(-),${PYTHON_USEDEP}]
-	)
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
diff --git a/app-emulation/virt-manager/virt-manager-0.10.0.ebuild b/app-emulation/virt-manager/virt-manager-0.10.0.ebuild
deleted file mode 100644
index ab4589d8cd20..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.10.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 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.10.0.ebuild,v 1.14 2014/04/26 08:15:47 pacho Exp $
-
-EAPI=5
-
-#BACKPORTS=
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit eutils gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
-	${BACKPORTS+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
-	x11-libs/gtk+:3[introspection]
-	|| (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		>=app-emulation/libvirt-0.7.0[python,${PYTHON_USEDEP}]
-	)
-	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	gnome-base/dconf
-	>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
-	net-misc/spice-gtk[gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
-	x11-libs/vte:2.90[introspection]
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	policykit? ( sys-auth/polkit[introspection] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool"
-
-DOCS=( README NEWS )
-
-python_prepare_all() {
-	epatch_user
-	distutils-r1_python_prepare_all
-}
-
-distutils-r1_python_compile() {
-	local defgraphics=
-
-	esetup.py configure \
-		--qemu-user=qemu \
-		--default-graphics=spice
-}
-
-python_install_all() {
-	python_fix_shebang "${ED}/usr/share/virt-manager/virt-clone"
-	python_fix_shebang "${ED}/usr/share/virt-manager/virt-convert"
-	python_fix_shebang "${ED}/usr/share/virt-manager/virt-image"
-	python_fix_shebang "${ED}/usr/share/virt-manager/virt-install"
-	python_fix_shebang "${ED}/usr/share/virt-manager/virt-manager"
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	cd "${ED}"
-	export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-}
diff --git a/app-emulation/virt-manager/virt-manager-1.0.1.ebuild b/app-emulation/virt-manager/virt-manager-1.0.1.ebuild
index c26da3790663..66e05166801b 100644
--- a/app-emulation/virt-manager/virt-manager-1.0.1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-1.0.1.ebuild,v 1.1 2014/08/06 18:24:15 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-1.0.1.ebuild,v 1.2 2014/11/24 10:22:44 tamiko Exp $
 
 EAPI=5
 
@@ -27,10 +27,7 @@ SLOT="0"
 IUSE="gnome-keyring gtk policykit sasl"
 
 RDEPEND="!app-emulation/virtinst
-	|| (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		>=app-emulation/libvirt-0.7.0[python(-),${PYTHON_USEDEP}]
-	)
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
diff --git a/app-emulation/virt-manager/virt-manager-1.1.0.ebuild b/app-emulation/virt-manager/virt-manager-1.1.0.ebuild
index f348b730684c..7b337c8e0f9b 100644
--- a/app-emulation/virt-manager/virt-manager-1.1.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-1.1.0.ebuild,v 1.1 2014/10/19 16:19:15 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-1.1.0.ebuild,v 1.2 2014/11/24 10:22:44 tamiko Exp $
 
 EAPI=5
 
@@ -27,10 +27,7 @@ SLOT="0"
 IUSE="gnome-keyring gtk policykit sasl"
 
 RDEPEND="!app-emulation/virtinst
-	|| (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		>=app-emulation/libvirt-0.7.0[python(-),${PYTHON_USEDEP}]
-	)
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index b1f4fc9e6f18..a1e10e94c876 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.22 2014/08/06 18:24:15 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.23 2014/11/24 10:22:44 tamiko Exp $
 
 EAPI=5
 
@@ -27,10 +27,7 @@ SLOT="0"
 IUSE="gnome-keyring gtk policykit sasl"
 
 RDEPEND="!app-emulation/virtinst
-	|| (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		>=app-emulation/libvirt-0.7.0[python(-),${PYTHON_USEDEP}]
-	)
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]