version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 119 insertions, 20 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 5a8e33b379e5..c90376f5fd60 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.122 2015/04/19 09:47:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.123 2015/05/05 19:21:04 tamiko Exp $
+
+*virt-manager-1.2.0 (05 May 2015)
+
+  05 May 2015; Matthias Maier <tamiko@gentoo.org> +virt-manager-1.2.0.ebuild,
+  virt-manager-9999.ebuild:
+  version bump
 
   19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> virt-manager-1.1.0-r2.ebuild:
   Stable for x86, wrt bug #545622
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 7daec6354048..c14ddea13a43 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -6,27 +6,29 @@ DIST virt-manager-0.10.0-1cd29748.tar.xz 11716 SHA256 a9293c2fcadd230cdfb13977c7
 DIST virt-manager-0.10.0.tar.gz 2548256 SHA256 59bd8f316917228885261a1ecbeb9aadbb0b0e02cdf5fc974c78113c5814346d SHA512 13eaed3645ccee79da6a972e02bb182b5bd24981ff55b6322b8aaf2689fab520f22f1e729bb5f5287d66526252a31a531c6595ee27489a52fb4829ae18cf8204 WHIRLPOOL e3e34506171217c63e5e5337157f75006554afb156a430f2ee7f11e354d0c490adc371174b342efb4cc90ab0686d2c74f42b4d52c55c0a9221868670980fdbb3
 DIST virt-manager-1.0.1.tar.gz 2472879 SHA256 08e3740ae07292bc3f68160a43897fccb90d7bc14ffb133c8ad685c9d44444d8 SHA512 a7ef49b5f985998a5dd0dc27c1f42131c2df7f8c4b54d2e11843a25783ae05912445f01a1e4b00d4d8a38e8135d35d5863273b6f68dd253bc1159a85b0df6652 WHIRLPOOL cdf9a3f3e53ae101797cd3a129401b160293919dc1f09542370baf34c8197fe61c20b900f6b9f81a35b9c188a4c30856cf5393d23a2028f6cfc757b6ca3ef68b
 DIST virt-manager-1.1.0.tar.gz 2509440 SHA256 ab0906cb15a132f1893f89ac4ca211c6c2c9c2d1860fbc285edbf9451c0f7941 SHA512 8c3aa56e13f1ec4a67e353b15b4f61bdc067300dbc459790b04e5f5258bf526694ec712a9f74d7af48ddd271081d48ae98d576f4bc5ed139e046620a9aa64e2d WHIRLPOOL aaffdf75b313c88a10648503bf552357139aff2a1624da1b17cac3975fec21ad6c3ccce00999ef8f4f1f4731aabf5ae2c07e70e453785caefe932c3b0deab456
+DIST virt-manager-1.2.0.tar.gz 2516620 SHA256 f8ca4a562a5e4a7795f3fecb5cc07bb32a298c955c9de436a1921f83c5e8a514 SHA512 28fc334ea83e766978ab8b6bc927cc463a0695eb047cac5878a43baf28876f28470903dab6c4ce9464454b3d865c464ef96b2fe63f3f43ad427020f2bf5e8271 WHIRLPOOL 07ad9fe0c43a0da051743bba2ab95d1c7b08b4b488c665b0ef9d0ed9cbb5da7594cfe158151148a5b801cab35546e5cdf2ee2cf9df51aba8bd3c11351cae0978
 EBUILD virt-manager-0.10.0-r2.ebuild 2519 SHA256 0631da54326ec89f8aa17b2fda6a005a8ea5cca7c79739c660a7d177b7838652 SHA512 4f4d6bf9954bf8437ec435d57857271edbdea7213b4c02ffa48edeb500cb4fdd8898eb0f7dce2ba03c262736a31ca588a3386f68c5ebef8974bf9de3151e9e96 WHIRLPOOL 47722772ebfd3dae474681e95efca05e1d1e43757a518ead625eb715f2be653b8fe8a8f40e663864c8817ea8530e38aaaef662f236febe762b4c70abf68ce75a
 EBUILD virt-manager-1.0.1-r1.ebuild 2492 SHA256 187110dcb958b4a696eb6e50e54ccd5aad23cbb8a015eb854bd3b6abe33e0593 SHA512 5ddb3ea96f1080456842d6a8db9ef7efeeb754c7c612129ff24f86ae5b745cd2c7d90e7a66b3a1a4f543043029b93a3678e3029b2f95578d7db35ce3ff0329bc WHIRLPOOL e281f5df48a2e3392e89e15dff29dbf522d35bcff303238e1faefc6f6adb88b10c97339ee057df1bdd17fff4f674800fdf125022882aa76e03f16a0261ec2fa5
 EBUILD virt-manager-1.1.0-r2.ebuild 2581 SHA256 49ef8df8eeb30905cb6a1921875ca5e214a18ede670a140d556a8b2afaef9ed8 SHA512 00d687afce2d5182e5c0b8bd7da8bda60e61b4b73fd5cc25cfc456e9abae7fd3254f76880d7240c6f1c1b48c325fe9fb3de0217e412ed1945d619a6e7ef174f4 WHIRLPOOL 45655c008111ee0ea88e21ca1f5b8309c96f47d9f8500bc2fcdd6e9dabb0c374c52d9c3955ab6550a10fad30bc8708bacc41372e6f77b0a64374d4a572cd6108
 EBUILD virt-manager-1.1.0.ebuild 2460 SHA256 307f97c185e37e418e4624a4f8361212903a446046c9f43bf6e621e2f2a130c9 SHA512 7bd98018740e3c54a83727141d0f566bd76d2383c239b56b5a36566c989d027ae802c2f4cd0122eb53c40393dd2e8777229c28d5ba310c6f8d9cc0a6bf3253c4 WHIRLPOOL 86f7df5631eaca6855230f212182e00c7fc6799eea7a61f371ce68f939f9683e0948474cbda77afaa97a9c4414078525649d7ec3900005f8c580b97fb82f50dc
-EBUILD virt-manager-9999.ebuild 2566 SHA256 e3df51bfbf30e5afc33fbeabb9f43ad969ceae59c6672cfe502b40367253ef68 SHA512 7f19433b37aad2c2816c330fa3b0c786ace33cbca2d3f73393b289cf3da05d3505d074a76dc23170d633b7e4e4cf3d7cdcfc3f2cb2b07535c85b6c15ab9d5529 WHIRLPOOL e5a003fa0cb6eb9f9b8cd3de8c159bdae4e4d890b9e7038fea4d0eb24a1af9f2c0393810d79d442cf9f80db429fd6d751d338dfab330a93cf3f17793499adb20
-MISC ChangeLog 22612 SHA256 18fb694a56833d7cacd4a12b1d2700822f94c93bb761a9fee5a19e726be0f996 SHA512 9851d2015afb934c6644cb8c2f5bc6666171e382e891ed652d0286fa5120a639b4ab4800b8ef60e0fbcd5dd07cd1d9f4fd1272ff04f2f8b2c48575fd0e824ce4 WHIRLPOOL b1bf758901e51b8b3e193fdcd8cf09a789c2e1e33d778da3111e7576215e2941f0a0812bdd705e6d68d609447ef18767333298f6776e0cdab74e033cd98a6586
+EBUILD virt-manager-1.2.0.ebuild 2534 SHA256 c0f784106ed51daf5976e8df4d617a0b2fe32c99d03206dceb828732312ac9fb SHA512 77b88c62878b4195db9c57423a4fe268f423ab123a26aac0165bfa32ccb0ac1175bf318d696cfa5ed4c1a9c30b089b935de89de4c0860939b785c48ee0464944 WHIRLPOOL e9a67e7445a04ef8f127e720c15735ff5b035076e9bd9f9a41dc11a2ccbc58051beb8ec7a24857e89d30b7a1684cc5a1a1b914f611f157f04c8f9864f1a1ae40
+EBUILD virt-manager-9999.ebuild 2510 SHA256 78ad0427f138acd7214c9a74711be04d02bf7011fb4490ffc8ffc57d693bcf18 SHA512 9eda4e5fd0a80e658a8407466797a7d2d609fdb035cbfcb3c2aa7a044c9e3c56a8af2a3c966c0e862f72e23763993a0b792a81a931a4005da81e19ae0b2e8d7c WHIRLPOOL a46087bbcaca82c640ebea3ec1b6bbfa47fb8d73b8152ef061563afe63ec9d336bb002a2f7fc08cdad79e9ea788f56aad4aa4f7cf791dcf723c0c637a275125d
+MISC ChangeLog 22772 SHA256 b8a63bff83b0c5aa2d8c2e62013b65465ed319d65d7209bc2c018d461ad2d6c8 SHA512 d9c376586e98ffffcb68499d3619378b3b7d08524099086b9105b4680c20150be2a2cd040b219146d9cde61423351347de0dfaff7c8d1c676ee27138930179e6 WHIRLPOOL 73a2f03a2d3d1889abebf7e915c431c54d8a9273820d48094bbfcdb61e7ed2b950cd83f2c1d8dd07c5f53f798bc4e854476f4fa7ec606a4b8e579323411e5851
 MISC metadata.xml 554 SHA256 4598a2e6e2c9ba1a53497623750b9779912372b9278f410fdd5b480c3cf4a59c SHA512 97aac2a38fb2923c334ec3d4b3410471f9d5b9b7435b92d93804107726cc5576f086226757337e6da1fa021533bc453a5aca3620b54599f3a8242f3f26a30f8c WHIRLPOOL 951f7ddd5a876cd75406c5ecf574089ed0eebc66d004713e64d7befc81efdb8bdea21acf77282af979cd3e15919e1790e1a4036d7550645b5c8ff5a5e57a59fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVM3mWAAoJELp701BxlEWfbwUP/1aiO4bYw5j2xwRPOZMZZ9jZ
-8Pd/oJQ8xJMJ8t9JKFhPk5HEF5+ztISiocS1rAlc5rHVyetLQUSUriwzEHmDYyO6
-M3Lg89XTAw/MHhBqiz1Au1UCDa9VJmsjTzBFZFWxW7WvNSs82keAPH+atGOrR6Sy
-/bQHgwI1nWWk53OlTOZ+azmnJNDgCfSoGbuRrK3XFzAufn20pGg8+J29lxtR1k19
-FdIn4CLgxd4hMm1HfSn14BVrEk1uh6nsF/Wj9tw0zeY8E1JhKzmh5kZNEsaMfTq+
-nyrINZDNZtGv/M/UupTJo0/LZ4mZg0Po8KctvfXXtU72Ne9xSP0F59WYVKmxPCAq
-5iFJLSon5T/F+Q0AUA7Z79tyKdFIb9YhnH0/OhL80UEmgaYJn2jbqBz/q0nm54zf
-2SiRwFZq8KsEdfavmrd2zhHfAjIo+Bg9bz4f3NCJLeCkYfC3AhnRmuRC1mWCJy3K
-znPt1LTjpiGo3klmD83BO3dG2aCEhuBeHhrIJC+1oRkC5E9YaQOORJ+rrLfUel17
-PIU4v37kjNa17spa2Dh2jDmx98uLhZbZfHsOHhZgpt2yNVuVKgtbP1oEQ1/lqtYg
-MafNO3O/ZTDvozpDtvS7TLdHmpFqlO8y2lLNumXVcjN/wXg94lL88eVa+bxFQfZE
-2WvPBxTRjDWUigHkuVz6
-=QTxQ
+iQIcBAEBCAAGBQJVSRgdAAoJELhOzYlK7nn/0kQP/1B/yRy1EllPxyov+2XhNukE
+bGTJiQh3cs+BpHTjYeOSWsIZmjsHuMoJZmYf7dO8pkGIM9YJx8jVl/ptdUOO18cc
+JEXlzzsHuKjHz/pKwKgr/3eZQnouF/h2wtP+jIlb5l0bEVcNrwNoksoWdpl/UGnj
+UU50pOKc9EEf+ZJw7RLIMrStM8J/pHY5jG28+oYJ04E6yXqun3Tr1OGNloaJfS6Q
+jYHT4RHCDJcczEJYj91Te5bGd1WHM00oo6MMkvFa3eU6Z4xZeuSlBd9RclP2MbEv
+5tPPFuv2rmKQ+Joz1F7EH95a7wdwvG0EIrOFi/4imJes+3nYob5/455sfuX2S0p/
+3nrTGclV2kgYRauJ0iYoMOmWyfH5+5MKzgortq4ksdZvPjpM4AEpqP7MZ8vuCbQG
+drUYTWuuyftewq6BpOMTr3OPYdzIk+kfwc00WkRDJgayKpYpru3NwQ6mlhS4k6tk
+2VLZ1y6GaEW7xMsNukO3vEMgaknTqYzxJkM21AJCLU6AwpElGpyuVQBwby+lJwqM
+PebDaukb0zXf06OyA6h9m7q/j9TuGdpbmbuuph1jflSZvrgIOngNcKBEPPjQU0xz
+nsAKfXlN1hnDo5cXISkapJjVUh18fxWcg7dDiF9CUVOBJ6bToNeIpcCn1lpdqKnr
+ENvV3hxkuPd01M0cKZiI
+=Qj3Z
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virt-manager/virt-manager-1.2.0.ebuild b/app-emulation/virt-manager/virt-manager-1.2.0.ebuild
new file mode 100644
index 000000000000..544fe3408cfc
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-1.2.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 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.2.0.ebuild,v 1.1 2015/05/05 19:21:04 tamiko 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-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,python,${PYTHON_USEDEP}]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
+		net-misc/x11-ssh-askpass
+		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 )
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+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
+}
+
+pkg_postinst() {
+	use gtk && gnome2_pkg_postinst
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index fea84e209fcb..8fa4ef9d3336 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-2015 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.28 2015/04/13 12:33:05 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.29 2015/05/05 19:21:04 tamiko Exp $
 
 EAPI=5
 
@@ -53,8 +53,6 @@ DEPEND="${RDEPEND}
 DOCS=( README NEWS )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.0-optional_avahi.patch
-
 	distutils-r1_src_prepare
 }