From: Doug Goldstein Date: Wed, 27 Jul 2011 15:37:30 +0000 (+0000) Subject: sync up the 9999 ebuild to the features of the 0.8.7-r3 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4353952e8bfe167658e93d8c396de4c3aec5d948;p=gentoo.git sync up the 9999 ebuild to the features of the 0.8.7-r3 Package-Manager: portage-2.1.10.7/cvs/Linux x86_64 --- diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog index 12b753af434b..dc386e53befa 100644 --- a/app-emulation/virt-manager/ChangeLog +++ b/app-emulation/virt-manager/ChangeLog @@ -1,6 +1,10 @@ # 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.52 2011/07/26 16:33:23 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.53 2011/07/27 15:37:30 cardoe Exp $ + + 27 Jul 2011; Doug Goldstein virt-manager-0.8.7-r3.ebuild, + virt-manager-9999.ebuild: + sync up the 9999 ebuild to the features of the 0.8.7-r3 26 Jul 2011; Doug Goldstein virt-manager-0.8.7-r3.ebuild: Add back ~x86 keyword since net-misc/spice-gtk is now ~arch keyworded on x86. diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest index 8dc416167e61..fd9fa51ffa16 100644 --- a/app-emulation/virt-manager/Manifest +++ b/app-emulation/virt-manager/Manifest @@ -1,8 +1,8 @@ AUX virt-manager-0.8.7-vcpu-stats.patch 876 RMD160 f77163cf34423675130f1c8368261b1ccfc77715 SHA1 0f30def046c2407e8c1ea2cf45aebb9cfd6f71c5 SHA256 43dd7dec0e01d7c82085d8f97767f0a7403554d1cea9f132fe4af5f01b0315a3 DIST virt-manager-0.8.7.tar.gz 1879504 RMD160 e80475270e54018b89e5a1a58c467478c03c71b5 SHA1 fe1565b9836b23cefb37d60b403be5b302e83472 SHA256 1907ec0e5479d6af8b4882fc068b74fa8c04f8d36ab0a503b405a937fe765dd5 EBUILD virt-manager-0.8.7-r2.ebuild 2113 RMD160 4125bcb91544b2f24702f94e3a27e0daa3dc9edf SHA1 bd54c88e960822bbebfffd3418cd3b334fd60c3b SHA256 6edb2c5eb9983440e826da25e6c20f7492680a91062e4e9fff31e5c0fb45a4f8 -EBUILD virt-manager-0.8.7-r3.ebuild 2291 RMD160 5084c7e5bc986e8a182e22311192528bfd3c3c86 SHA1 587f08e707f931f7c92a6711db76e79aff981042 SHA256 3c4cef472ba28ec57b25b545eab47edb110aeb0b796977b89a25232f7596082c +EBUILD virt-manager-0.8.7-r3.ebuild 2926 RMD160 79022b8089c4d9145906ddd390d9c3d0e844ea66 SHA1 6a39b37c1f3c518953017242976a4307e7b1e47f SHA256 5cc419c5e08b03c7067e42042eb679b595555dff620b87ab322fa51b7ae19628 EBUILD virt-manager-0.8.7.ebuild 2063 RMD160 cfe31b764bd7b073a322ae63041dbb70535838a7 SHA1 81c542cc778c600a262a281fc0e3558b6c881603 SHA256 5e46b8dcd6b068ec66b99bbc0e5b5e958340e21b6a4770a246e36f29af1449da -EBUILD virt-manager-9999.ebuild 2699 RMD160 1d51d4f11dd9e6b94c934d8bcfe4d4e6921332cd SHA1 51967527371624ed26f28618a64e665862539b15 SHA256 96960103261609ec49ec6767f1037d116b9551ab1b1e38a042d949cc8768571e -MISC ChangeLog 10533 RMD160 c49d2536780ce5bacf9f90212392fff5ba9ae287 SHA1 a45f3c0aacfcce7cf79e88fdb6bc84b8f3cbc01b SHA256 2e0fbfc189e4c7c3c0f3046ab63fa9c493c176427d68ccae374d0050bdb349e8 +EBUILD virt-manager-9999.ebuild 2877 RMD160 4552e0051034353f10674176343c5e6547072999 SHA1 6396698afcd615a57d70412cc0b7fc61226e0aff SHA256 dfbbf71b9a70d08e17ccbe8c31b065fdb736fb1a0144535466fe485dcd360b22 +MISC ChangeLog 10700 RMD160 1467ac5f6baa8dac2207f9650a62bfe06e610479 SHA1 20790689dbcca69cf27f929582620d9a26c884f0 SHA256 d62b2f14bbbc4a69a13033e38d03f10370ae613757333f82c9c20015676458bc MISC metadata.xml 641 RMD160 e8662f1753b0ffab34fb8539ec9c336f2e3cd769 SHA1 09b8ce549752a40c389c0e28279c2608ed8780af SHA256 3d4ac13637c95e0524006f0cbaf690d4dc8d3f7faf2e36581be8730aba6cc672 diff --git a/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild b/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild index dadf2b7af222..19d7643e96b4 100644 --- a/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild +++ b/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild @@ -1,22 +1,33 @@ # 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.7-r3.ebuild,v 1.2 2011/07/26 16:33:23 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild,v 1.3 2011/07/27 15:37:30 cardoe Exp $ #BACKPORTS= EAPI=2 +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git" + GIT_ECLASS="git-2 autotools" +fi + 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} -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" +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.6" +fi DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)" HOMEPAGE="http://virt-manager.org/" @@ -52,6 +63,19 @@ 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 -rf 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.in + eautoreconf + fi + epatch "${FILESDIR}/${P}-vcpu-stats.patch" gnome2_src_prepare diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild index cea8a9754f67..486b2c492858 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-9999.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-9999.ebuild,v 1.6 2011/07/21 21:08:50 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.7 2011/07/27 15:37:30 cardoe Exp $ -#BACKPORTS=1 +#BACKPORTS= EAPI=2 @@ -33,7 +33,7 @@ DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)" HOMEPAGE="http://virt-manager.org/" LICENSE="GPL-2" SLOT="0" -IUSE="gnome-keyring policykit sasl" +IUSE="gnome-keyring policykit sasl spice" RDEPEND=">=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] @@ -45,11 +45,16 @@ RDEPEND=">=dev-python/pygtk-1.99.12 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) - policykit? ( sys-auth/polkit )" + policykit? ( sys-auth/polkit ) + spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )" DEPEND="${RDEPEND} app-text/rarian dev-util/intltool" +# The TUI (terminal UI) requires newt_syrup which is not packaged on +# Gentoo. bug #356711 +G2CONF="--without-tui" + src_prepare() { sed -e "s/python/python2/" -i src/virt-manager.in || \ die "python2 update failed" @@ -63,7 +68,7 @@ src_prepare() { # unless we do this touch config.rpath - rm -f config.status + rm -rf 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,' \