Bump to 1.0.1, fixes #501532, #509642 and #516414

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64

4 files changed, 102 insertions, 9 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 8240a13e4d9a..0fe3701dffc8 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.105 2014/08/06 17:50:43 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.106 2014/08/06 18:24:15 thev00d00 Exp $
+
+*virt-manager-1.0.1 (06 Aug 2014)
+
+  06 Aug 2014; Ian Whyman <thev00d00@gentoo.org> +virt-manager-1.0.1.ebuild,
+  virt-manager-9999.ebuild:
+  Bump to 1.0.1, fixes #501532, #509642 and #516414
 
   06 Aug 2014; Ian Whyman <thev00d00@gentoo.org> virt-manager-9999.ebuild:
   Sync 9999 with latest stable, add missing sys-libs/libosinfo RDEPEND per
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index a7f20defec79..5126b8e7b004 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,10 +1,12 @@
 DIST virt-manager-0.10.0-1cd29748.tar.xz 11716 SHA256 a9293c2fcadd230cdfb13977c7c5520c0f74e38cebd199e8de2cce68e5b0efd3 SHA512 87312537a05a99c7df4c3fcf47bc4820a3e8b6c59bd39adf7aa803383bc3f69aa615dcada71b82b51bb92c83daaa7cb528279dcb9b6f36247d6e24665376a086 WHIRLPOOL e86c0dc6ae774c047bb130ecef618a4583ac76bb265b08c45d41ee1d8e10a128a6a3a1bf7e02827f70201b7ec973e7e95756cc4f11aece7d6bda87e0085bfa0d
 DIST virt-manager-0.10.0.tar.gz 2548256 SHA256 59bd8f316917228885261a1ecbeb9aadbb0b0e02cdf5fc974c78113c5814346d SHA512 13eaed3645ccee79da6a972e02bb182b5bd24981ff55b6322b8aaf2689fab520f22f1e729bb5f5287d66526252a31a531c6595ee27489a52fb4829ae18cf8204 WHIRLPOOL e3e34506171217c63e5e5337157f75006554afb156a430f2ee7f11e354d0c490adc371174b342efb4cc90ab0686d2c74f42b4d52c55c0a9221868670980fdbb3
 DIST virt-manager-0.9.5.tar.gz 1773882 SHA256 5d2afb282fb8c4401f9e203dcb41a62746b9a909258d440d508219bc1a33803d SHA512 a1ecf6fe9f3ddacfe43006cfc388d9324c457be91767792119d8a112b190739e3274dfeb7cffd28534b86a33f86079c569d8337eeddaa9d60ed69f82d8a4627f WHIRLPOOL d15728e55c0a3e361b42b6e615bed50b8870c436a12ae0ececcd80d47d0482ea01c33f5497672e050aa6465f9b031948bf92925710c4340837d789d4634506c8
+DIST virt-manager-1.0.1.tar.gz 2472879 SHA256 08e3740ae07292bc3f68160a43897fccb90d7bc14ffb133c8ad685c9d44444d8 SHA512 a7ef49b5f985998a5dd0dc27c1f42131c2df7f8c4b54d2e11843a25783ae05912445f01a1e4b00d4d8a38e8135d35d5863273b6f68dd253bc1159a85b0df6652 WHIRLPOOL cdf9a3f3e53ae101797cd3a129401b160293919dc1f09542370baf34c8197fe61c20b900f6b9f81a35b9c188a4c30856cf5393d23a2028f6cfc757b6ca3ef68b
 EBUILD virt-manager-0.10.0-r1.ebuild 2073 SHA256 23b643a9a64b52354d4f74c8de955fc54cb64f7ef0b2c85ebc865a5a266011c7 SHA512 14b4eccad392dbfd84907d55ed2226dd0f97dee6d3bf9d81a5c4db3ca995198731def55686627bd99a03522540330a9dad1aac77a21e1170bccc760fe4cf80cd WHIRLPOOL e4ed48557a0700802fe878ee5c2aefacba8156c95894b311ba93b13b9ab4828e08c2c6d6843e1704edd6cf27ff61311beee3ecfc2e8ffedde956e1894420d448
 EBUILD virt-manager-0.10.0-r2.ebuild 2507 SHA256 0b51474d33bcaeded14ca6417805cacdf22b31112b9d56095c1d2376eed28335 SHA512 b6f25d7c579f2cbaf3a12d7b035ce134129baf294f8d316ccc15585e385a7e33632199cafafcb3d74a76f55128c0e1723ba991e1c521bc02a8def313f944fdfd WHIRLPOOL 2cc439be62f290e94d3ad765c61ead423eb3351dfdaa15bd3e4b00cbd652fb988af144252f383b256cb05f015d23fb9b68162470833f7d0efe1dbd30d4f2389a
 EBUILD virt-manager-0.10.0.ebuild 2298 SHA256 4b11437d42dfbbaf15cdf3d567d5b414dcb6853d15ea9f29c8143780686270e6 SHA512 0a8ebeb270571de3a5467e4efccd3f00db1c556017d04db6d4b753f82eac760e39b12f01e0a1d4044279e59c76479588d7271aaa2c37e677f41b33aca310d700 WHIRLPOOL 9e5e1f5ea179fea1c7c5b5f8af0754e9e7bd58221c898ac2db6c669e0e845f21c6c9536205de8fe6b8bc94a5e8bf2cd03e0a4a1a5a4d4d34a475e9b16dc2bef7
 EBUILD virt-manager-0.9.5.ebuild 2651 SHA256 b36fbda7acd3d873ba408bac74bbb801fc697bf771443e69353c1a1f5c6c7dc9 SHA512 bfe17dda6a5d98494135040ee23875dc4df107cfd9e324405612ba473dea8537d18b37e93515b2939931fa58dacfb3014a1ed9e75b7bf1c9929c4046ac508487 WHIRLPOOL a23f89d18d7a94c6aea1732e9bb005a46b9c324ed7a27528ffe75f7b0448ae6f31d947a9b2501d28540687d7c3f70ddbb75c3c9f7197afda9c595d4ccc66fdef
-EBUILD virt-manager-9999.ebuild 2543 SHA256 73c08ebb31b91bd4ab7c64e07a6926fd7441a256311a75670f000e53185059fc SHA512 41d0715055920506da7a56ef00259c16b5e94bfdd1a213a95a9ef0766c8459740cc1ae1582e48bed7d99df4b96a606535cf93783033133b02db99dfcffedee89 WHIRLPOOL 88bbf22c4d85202639f993bc1f5537ae02f8057b5df85ab3f8fde0fd5fd60b4044330a6025a310b9cafe2df1d4fd3992ff2e00dd70f95d1b14c4baf90aee1ef8
-MISC ChangeLog 19665 SHA256 a4a057924381b408a4d5bab1a8262ad7892a2fa7ef93ae30dac64c1ef3332f0b SHA512 9bf111d824cd27ffaea84c31c8655966bfa8992efdd856f689d59348362fa0ff2978ce05673965b5614f4f705aae020d98722b3379ec77f1e4775a2cd511e536 WHIRLPOOL 80dd47630d6bc044917f0cde04a566c5e0105aaa6b6b999f24bcbf2c5ceac0c65936ec58e8a2bc29c86fc170601180b1f57c5fc0ef648b234379d8869225af6e
+EBUILD virt-manager-1.0.1.ebuild 2450 SHA256 2c3d03b3daced98be0b8f7015f99bd6e08af958c47c2b635a837c6d620b9c33d SHA512 2cf1dbb2b676b26f9b8c18b2d3bfe596ca50bfca6863950701422e4c2971c1381e179184d151098e2fbb599fe82ff4eb7ad8574185f46132f5587a957d9cfd30 WHIRLPOOL 8b76e007f93c4255b6ada6919b8720415c437398b3d55630cf317842bf428b04581ac1b1055689da041451138b57b58c92717d0bb279934c561b5717e3d28fc1
+EBUILD virt-manager-9999.ebuild 2450 SHA256 f2c6ab270c0039dd64538bda31f6db4876c8112388ed738f7fb72fc071e861e5 SHA512 31ed05da56a525140526de6997f8b9b9978be2696fc00bda4911ba71051624a66d48acc635efd0295786bb5f97686d11a4623ccce5e6e6b9df29765c1f50de31 WHIRLPOOL 481c8327c55bb7ee87f3c9a66e96ac4d4a69f01b7ce103b4140343c414e8d7b6ce97444838c5dd5ca3649192f416efdf4b1ca11f3ec8d067ac605d30d61fd821
+MISC ChangeLog 19858 SHA256 17149622488446ec6a021c9cef02c92b89aa0deae8517c63eb59c55f49e7e12f SHA512 e7c39d53c45e981e33061f2d5e9a310a40bd7633288cb48dfe0f15a53fba387a63baea234467bfd625a7d62477e24e924a3f6d539c5d528c8598db89dd7972e4 WHIRLPOOL 72ada721cbf28cd7e326c7e09403e3c2a61909891c92390b04574c28e90eedfe7f073638c0c6123a657ab101e1bc2a8bdf08d0292dd7822e7fd1e65ba6a1eb96
 MISC metadata.xml 722 SHA256 70795a507d431d9f6682777a65b480eeb0d762368f3150552b7d17bf98f96bed SHA512 1a6cb74025b5f750c82f7c373638a764f19057bbb076e96688f73690362ef197d8a38333873f8ec5baaa9cdf11a0848c83c1d86403f17b70347d7f6ca8fcbe3f WHIRLPOOL 5a3b8cbfbdbada615803ac5e6cf3a21ebc6f5d15ee1d440be6de3efcd129557c6651aac91192b8b94ed7171e856cc564e9f49c7c5b6d425d2b778621f644c7ef
diff --git a/app-emulation/virt-manager/virt-manager-1.0.1.ebuild b/app-emulation/virt-manager/virt-manager-1.0.1.ebuild
new file mode 100644
index 000000000000..c26da3790663
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-1.0.1.ebuild
@@ -0,0 +1,87 @@
+# 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 $
+
+EAPI=5
+
+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"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+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}]
+	)
+	>=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}]
+	sys-libs/libosinfo[introspection]
+	gtk? (
+		x11-libs/gtk+:3[introspection]
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection]
+		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] )
+		x11-themes/gnome-icon-theme
+	)"
+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() {
+	if use gtk; then
+		gnome2_pkg_preinst
+
+		cd "${ED}"
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	else
+		rm -rf "${ED}/usr/share/virt-manager/virtManager"
+		rm -f "${ED}/usr/share/virt-manager/virt-manager"
+		rm -rf "${ED}/usr/share/virt-manager/ui/"
+		rm -rf "${ED}/usr/share/virt-manager/icons/"
+		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+		rm -rf "${ED}/usr/share/icons/"
+		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+		rm -rf "${ED}/usr/bin/virt-manager"
+	fi
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index fa92bfe3ad67..b1f4fc9e6f18 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,11 +1,9 @@
 # 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.21 2014/08/06 17:50:43 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.22 2014/08/06 18:24:15 thev00d00 Exp $
 
 EAPI=5
 
-BACKPORTS=1cd29748
-
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
 
@@ -20,8 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	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}"
+	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -44,11 +41,12 @@ RDEPEND="!app-emulation/virtinst
 	gtk? (
 		x11-libs/gtk+:3[introspection]
 		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection]
 		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] )
+		x11-themes/gnome-icon-theme
 	)"
 DEPEND="${RDEPEND}
 	dev-lang/perl