Date: Thu, 20 Nov 2014 16:48:48 -0800 From: Jason Helfman <jgh@FreeBSD.org> To: Jason Helfman <jgh@freebsd.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r372972 - in head: . deskutils/virt-manager deskutils/virt-manager/files net-mgmt net-mgmt/virtinst Message-ID: <CAMuy=%2BhiC3SWj6%2BOOmv1_sfWh3QEXu80Nw1oE4hQ%2B1L-uiJnRw@mail.gmail.com> In-Reply-To: <201411210048.sAL0mCNg057762@svn.freebsd.org> References: <201411210048.sAL0mCNg057762@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Many thanks to kwm@ !!!! -jgh On Thu, Nov 20, 2014 at 4:48 PM, Jason Helfman <jgh@freebsd.org> wrote: > Author: jgh > Date: Fri Nov 21 00:48:11 2014 > New Revision: 372972 > URL: https://svnweb.freebsd.org/changeset/ports/372972 > QAT: https://qat.redports.org/buildarchive/r372972/ > > Log: > - update to 1.1.0 > - patch to work with gtk2/3 [1] > - this update obsoletes net-mgmt/virtinst (merged) > > Changelog: See http://virt-manager.org/download/ > Obtained from: > https://build.opensuse.org/package/view_file/openSUSE \ > :Factory/virt-manager/virt-manager-Gtk-30.patch [1] > > Added: > head/deskutils/virt-manager/files/ > head/deskutils/virt-manager/files/patch-setup.py (contents, props > changed) > head/deskutils/virt-manager/files/patch-virtManager_config.py > (contents, props changed) > head/deskutils/virt-manager/files/patch-virtManager_console.py > (contents, props changed) > Deleted: > head/net-mgmt/virtinst/ > Modified: > head/MOVED > head/deskutils/virt-manager/Makefile > head/deskutils/virt-manager/distinfo > head/net-mgmt/Makefile > > Modified: head/MOVED > > ============================================================================== > --- head/MOVED Fri Nov 21 00:28:36 2014 (r372971) > +++ head/MOVED Fri Nov 21 00:48:11 2014 (r372972) > @@ -7238,3 +7238,4 @@ deskutils/gtkjournal||2014-11-19|Abandon > deskutils/splashsetter||2014-11-19|Abandonware, useless without gnome2 > editors/emacs23|editors/emacs|2014-11-19|Has expired: Unmaintained > upstream, use editors/emacs > net-im/tg|net-im/telegram|2014-11-20|Renamed to more specific name > +net-mgmt/virtinst|deskutils/virt-manager|2014-11-20|Obsoleted by > deskutils/virt-manager > > Modified: head/deskutils/virt-manager/Makefile > > ============================================================================== > --- head/deskutils/virt-manager/Makefile Fri Nov 21 00:28:36 2014 > (r372971) > +++ head/deskutils/virt-manager/Makefile Fri Nov 21 00:48:11 2014 > (r372972) > @@ -1,11 +1,9 @@ > -# Created by: Jason Helfman <jgh@FreeBSD.org> > # $FreeBSD$ > > PORTNAME= virt-manager > -PORTVERSION= 0.9.5 > -PORTREVISION= 8 > +PORTVERSION= 1.1.0 > CATEGORIES= deskutils net-mgmt > -MASTER_SITES= > http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/ \ > +MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ \ > LOCAL/jgh/deskutils/${PORTNAME}/ > > MAINTAINER= jgh@FreeBSD.org > @@ -16,29 +14,36 @@ LICENSE= LGPL3 > LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt > RUN_DEPENDS= > ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \ > > ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \ > - > ${PYTHON_PKGNAMEPREFIX}virtinst>=0.600.4:${PORTSDIR}/net-mgmt/virtinst \ > > ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2:${PORTSDIR}/x11-toolkits/py-vte \ > - gtk-vnc>=0.3.10:${PORTSDIR}/net/gtk-vnc \ > - librsvg2>=2.32.1:${PORTSDIR}/graphics/librsvg2 \ > - > ${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt > + > ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \ > + > ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:${PORTSDIR}/www/py-urlgrabber \ > + > ${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt \ > + gtk-vnc>=0.4.4:${PORTSDIR}/net/gtk-vnc \ > + libvirt-glib>=0.1.9:${PORTSDIR}/devel/libvirt-glib \ > + libosinfo.so:${PORTSDIR}/devel/libosinfo > + > +PYDISTUTILS_INSTALLNOSINGLE= yes > +PYDISTUTILS_CONFIGURE_TARGET= configure > +PYDISTUTILS_CONFIGUREARGS= --prefix=${PREFIX} > +USES= python:2.7 > +USE_PYTHON= distutils autoplist > > -BROKEN= Needs work after gtk-vnc update, maintainer is > aware. > +USE_GNOME= introspection:run intltool librsvg2 pygobject3 > > -OPTIONS_DEFINE= NLS > -OPTIONS_SUB= yes > - > -NLS_USES= gettext > -NLS_CONFIGURE_ENABLE= nls > - > -USE_GNOME= pygnome2 > INSTALLS_ICONS= yes > -GCONF_SCHEMAS= virt-manager.schemas > -GNU_CONFIGURE= yes > -CONFIGURE_ARGS+= --without-tui > -USES= gmake python > - > -post-patch: > - @${REINPLACE_CMD} -e 's|itlocaledir = > $$(prefix)/$$(DATADIRNAME)/locale|itlocaledir = $$(prefix)/share/locale|' \ > - ${WRKSRC}/po/Makefile.in.in > + > +USES= desktop-file-utils gettext shebangfix > +SHEBANG_FILES= virt-manager \ > + virt-install \ > + virt-clone \ > + virt-convert > + > +GLIB_SCHEMAS= org.virt-manager.virt-manager.gschema.xml > + > +post-patch-script: > + @${REINPLACE_CMD} -e 's|self.default_graphics = > "spice"|self.default_graphics = "vnc"|g' \ > + ${WRKSRC}/setup.py > + @${REINPLACE_CMD} -e 's|from gi.repository import > SpiceClient.*||g' \ > + ${WRKSRC}/virtManager/console.py > > .include <bsd.port.mk> > > Modified: head/deskutils/virt-manager/distinfo > > ============================================================================== > --- head/deskutils/virt-manager/distinfo Fri Nov 21 00:28:36 2014 > (r372971) > +++ head/deskutils/virt-manager/distinfo Fri Nov 21 00:48:11 2014 > (r372972) > @@ -1,2 +1,2 @@ > -SHA256 (virt-manager-0.9.5.tar.gz) = > 5d2afb282fb8c4401f9e203dcb41a62746b9a909258d440d508219bc1a33803d > -SIZE (virt-manager-0.9.5.tar.gz) = 1773882 > +SHA256 (virt-manager-1.1.0.tar.gz) = > ab0906cb15a132f1893f89ac4ca211c6c2c9c2d1860fbc285edbf9451c0f7941 > +SIZE (virt-manager-1.1.0.tar.gz) = 2509440 > > Added: head/deskutils/virt-manager/files/patch-setup.py > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/deskutils/virt-manager/files/patch-setup.py Fri Nov 21 > 00:48:11 2014 (r372972) > @@ -0,0 +1,34 @@ > +--- setup.py.orig 2014-09-06 22:26:12 UTC > ++++ setup.py > +@@ -209,14 +209,6 @@ class my_build(build): > + build.run(self) > + > + > +-class my_egg_info(install_egg_info): > +- """ > +- Disable egg_info installation, seems pointless for a non-library > +- """ > +- def run(self): > +- pass > +- > +- > + class my_install(install): > + """ > + Error if we weren't 'configure'd with the correct install prefix > +@@ -605,7 +597,7 @@ setup( > + ["data/org.virt-manager.virt-manager.gschema.xml"]), > + ("share/virt-manager/ui", glob.glob("ui/*.ui")), > + > +- ("share/man/man1", [ > ++ ("man/man1", [ > + "man/virt-manager.1", > + "man/virt-install.1", > + "man/virt-clone.1", > +@@ -627,7 +619,6 @@ setup( > + > + 'sdist': my_sdist, > + 'install': my_install, > +- 'install_egg_info': my_egg_info, > + > + 'configure': configure, > + > > Added: head/deskutils/virt-manager/files/patch-virtManager_config.py > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/deskutils/virt-manager/files/patch-virtManager_config.py > Fri Nov 21 00:48:11 2014 (r372972) > @@ -0,0 +1,13 @@ > +--- virtManager/config.py.orig 2014-11-19 23:35:48 UTC > ++++ virtManager/config.py > +@@ -20,8 +20,10 @@ > + import os > + import logging > + > ++import gi > + from gi.repository import Gio > + from gi.repository import GLib > ++gi.require_version('Gtk', '3.0') > + from gi.repository import Gtk > + > + from virtinst import CPU > > Added: head/deskutils/virt-manager/files/patch-virtManager_console.py > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/deskutils/virt-manager/files/patch-virtManager_console.py > Fri Nov 21 00:48:11 2014 (r372972) > @@ -0,0 +1,16 @@ > +--- virtManager/console.py.orig 2014-11-19 23:37:09 UTC > ++++ virtManager/console.py > +@@ -20,10 +20,13 @@ > + # MA 02110-1301 USA. > + # > + > ++import gi > + from gi.repository import GObject > + from gi.repository import Gtk > + from gi.repository import Gdk > ++gi.require_version('GtkVnc', '2.0') > + from gi.repository import GtkVnc > ++gi.require version('SpiceClientGtk', '3.0') > + from gi.repository import SpiceClientGtk > + from gi.repository import SpiceClientGLib > + > > Modified: head/net-mgmt/Makefile > > ============================================================================== > --- head/net-mgmt/Makefile Fri Nov 21 00:28:36 2014 (r372971) > +++ head/net-mgmt/Makefile Fri Nov 21 00:48:11 2014 (r372972) > @@ -308,7 +308,6 @@ > SUBDIR += victorops-nagios > SUBDIR += vidalia > SUBDIR += virt-viewer > - SUBDIR += virtinst > SUBDIR += wdiag > SUBDIR += weathermap > SUBDIR += weplab > > -- Jason Helfman | FreeBSD Committer jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMuy=%2BhiC3SWj6%2BOOmv1_sfWh3QEXu80Nw1oE4hQ%2B1L-uiJnRw>