1 |
cardoe 11/07/27 15:37:30 |
2 |
|
3 |
Modified: ChangeLog virt-manager-0.8.7-r3.ebuild |
4 |
virt-manager-9999.ebuild |
5 |
Log: |
6 |
sync up the 9999 ebuild to the features of the 0.8.7-r3 |
7 |
|
8 |
(Portage version: 2.1.10.7/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.53 app-emulation/virt-manager/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/ChangeLog?rev=1.53&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/ChangeLog?rev=1.53&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/ChangeLog?r1=1.52&r2=1.53 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v |
20 |
retrieving revision 1.52 |
21 |
retrieving revision 1.53 |
22 |
diff -u -r1.52 -r1.53 |
23 |
--- ChangeLog 26 Jul 2011 16:33:23 -0000 1.52 |
24 |
+++ ChangeLog 27 Jul 2011 15:37:30 -0000 1.53 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for app-emulation/virt-manager |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.52 2011/07/26 16:33:23 cardoe Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.53 2011/07/27 15:37:30 cardoe Exp $ |
30 |
+ |
31 |
+ 27 Jul 2011; Doug Goldstein <cardoe@g.o> virt-manager-0.8.7-r3.ebuild, |
32 |
+ virt-manager-9999.ebuild: |
33 |
+ sync up the 9999 ebuild to the features of the 0.8.7-r3 |
34 |
|
35 |
26 Jul 2011; Doug Goldstein <cardoe@g.o> virt-manager-0.8.7-r3.ebuild: |
36 |
Add back ~x86 keyword since net-misc/spice-gtk is now ~arch keyworded on x86. |
37 |
|
38 |
|
39 |
|
40 |
1.3 app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild?rev=1.3&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild?rev=1.3&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild?r1=1.2&r2=1.3 |
45 |
|
46 |
Index: virt-manager-0.8.7-r3.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild,v |
49 |
retrieving revision 1.2 |
50 |
retrieving revision 1.3 |
51 |
diff -u -r1.2 -r1.3 |
52 |
--- virt-manager-0.8.7-r3.ebuild 26 Jul 2011 16:33:23 -0000 1.2 |
53 |
+++ virt-manager-0.8.7-r3.ebuild 27 Jul 2011 15:37:30 -0000 1.3 |
54 |
@@ -1,22 +1,33 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $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 $ |
58 |
+# $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 $ |
59 |
|
60 |
#BACKPORTS= |
61 |
|
62 |
EAPI=2 |
63 |
|
64 |
+if [[ ${PV} = *9999* ]]; then |
65 |
+ EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git" |
66 |
+ GIT_ECLASS="git-2 autotools" |
67 |
+fi |
68 |
+ |
69 |
PYTHON_DEPEND="2:2.4" |
70 |
|
71 |
# Stop gnome2.eclass from doing stuff on USE=debug |
72 |
GCONF_DEBUG="no" |
73 |
|
74 |
-inherit eutils gnome2 python ${HG_ECLASS} |
75 |
+inherit eutils gnome2 python ${GIT_ECLASS} |
76 |
|
77 |
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz |
78 |
- ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}" |
79 |
-KEYWORDS="~amd64 ~x86" |
80 |
-VIRTINSTDEP=">=app-emulation/virtinst-0.500.6" |
81 |
+if [[ ${PV} = *9999* ]]; then |
82 |
+ SRC_URI="" |
83 |
+ KEYWORDS="" |
84 |
+ VIRTINSTDEP=">=app-emulation/virtinst-9999" |
85 |
+else |
86 |
+ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz |
87 |
+ ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}" |
88 |
+ KEYWORDS="~amd64 ~x86" |
89 |
+ VIRTINSTDEP=">=app-emulation/virtinst-0.500.6" |
90 |
+fi |
91 |
|
92 |
DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)" |
93 |
HOMEPAGE="http://virt-manager.org/" |
94 |
@@ -52,6 +63,19 @@ |
95 |
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ |
96 |
epatch |
97 |
|
98 |
+ if [[ ${PV} = *9999* ]]; then |
99 |
+ # virt-manager's autogen.sh touches this and eautoreconf fails |
100 |
+ # unless we do this |
101 |
+ touch config.rpath |
102 |
+ |
103 |
+ rm -rf config.status |
104 |
+ intltoolize --automake --copy --force |
105 |
+ perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in |
106 |
+ perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \ |
107 |
+ po/Makefile.in.in |
108 |
+ eautoreconf |
109 |
+ fi |
110 |
+ |
111 |
epatch "${FILESDIR}/${P}-vcpu-stats.patch" |
112 |
|
113 |
gnome2_src_prepare |
114 |
|
115 |
|
116 |
|
117 |
1.7 app-emulation/virt-manager/virt-manager-9999.ebuild |
118 |
|
119 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild?rev=1.7&view=markup |
120 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild?rev=1.7&content-type=text/plain |
121 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild?r1=1.6&r2=1.7 |
122 |
|
123 |
Index: virt-manager-9999.ebuild |
124 |
=================================================================== |
125 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v |
126 |
retrieving revision 1.6 |
127 |
retrieving revision 1.7 |
128 |
diff -u -r1.6 -r1.7 |
129 |
--- virt-manager-9999.ebuild 21 Jul 2011 21:08:50 -0000 1.6 |
130 |
+++ virt-manager-9999.ebuild 27 Jul 2011 15:37:30 -0000 1.7 |
131 |
@@ -1,8 +1,8 @@ |
132 |
# Copyright 1999-2011 Gentoo Foundation |
133 |
# Distributed under the terms of the GNU General Public License v2 |
134 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.6 2011/07/21 21:08:50 cardoe Exp $ |
135 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.7 2011/07/27 15:37:30 cardoe Exp $ |
136 |
|
137 |
-#BACKPORTS=1 |
138 |
+#BACKPORTS= |
139 |
|
140 |
EAPI=2 |
141 |
|
142 |
@@ -33,7 +33,7 @@ |
143 |
HOMEPAGE="http://virt-manager.org/" |
144 |
LICENSE="GPL-2" |
145 |
SLOT="0" |
146 |
-IUSE="gnome-keyring policykit sasl" |
147 |
+IUSE="gnome-keyring policykit sasl spice" |
148 |
RDEPEND=">=dev-python/pygtk-1.99.12 |
149 |
>=app-emulation/libvirt-0.7.0[python,sasl?] |
150 |
>=dev-libs/libxml2-2.6.23[python] |
151 |
@@ -45,11 +45,16 @@ |
152 |
>=dev-python/gconf-python-1.99.11 |
153 |
dev-python/urlgrabber |
154 |
gnome-keyring? ( dev-python/gnome-keyring-python ) |
155 |
- policykit? ( sys-auth/polkit )" |
156 |
+ policykit? ( sys-auth/polkit ) |
157 |
+ spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )" |
158 |
DEPEND="${RDEPEND} |
159 |
app-text/rarian |
160 |
dev-util/intltool" |
161 |
|
162 |
+# The TUI (terminal UI) requires newt_syrup which is not packaged on |
163 |
+# Gentoo. bug #356711 |
164 |
+G2CONF="--without-tui" |
165 |
+ |
166 |
src_prepare() { |
167 |
sed -e "s/python/python2/" -i src/virt-manager.in || \ |
168 |
die "python2 update failed" |
169 |
@@ -63,7 +68,7 @@ |
170 |
# unless we do this |
171 |
touch config.rpath |
172 |
|
173 |
- rm -f config.status |
174 |
+ rm -rf config.status |
175 |
intltoolize --automake --copy --force |
176 |
perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in |
177 |
perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \ |