Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Doug Goldstein (cardoe)" <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/libvirt: libvirt-9999.ebuild ChangeLog libvirt-0.9.4.ebuild libvirt-0.9.1.ebuild
Date: Wed, 31 Aug 2011 22:56:08
Message-Id: 20110831225558.B6F862004C@flycatcher.gentoo.org
1 cardoe 11/08/31 22:55:58
2
3 Modified: libvirt-9999.ebuild ChangeLog libvirt-0.9.4.ebuild
4 Removed: libvirt-0.9.1.ebuild
5 Log:
6 Sync up the 0.9.4 and 9999 ebuilds. Remove the previous stable version as well.
7
8 (Portage version: 2.1.10.11/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.9 app-emulation/libvirt/libvirt-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.9&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.9&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?r1=1.8&r2=1.9
16
17 Index: libvirt-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v
20 retrieving revision 1.8
21 retrieving revision 1.9
22 diff -u -r1.8 -r1.9
23 --- libvirt-9999.ebuild 20 Jul 2011 14:51:41 -0000 1.8
24 +++ libvirt-9999.ebuild 31 Aug 2011 22:55:58 -0000 1.9
25 @@ -1,10 +1,13 @@
26 # Copyright 1999-2011 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.8 2011/07/20 14:51:41 cardoe Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.9 2011/08/31 22:55:58 cardoe Exp $
30
31 -#BACKPORTS=1
32 +#BACKPORTS=2
33 +#AUTOTOOLIZE=yes
34
35 -EAPI="2"
36 +EAPI="3"
37 +
38 +MY_P="${P/_rc/-rc}"
39
40 if [[ ${PV} = *9999* ]]; then
41 EGIT_REPO_URI="git://libvirt.org/libvirt.git"
42 @@ -22,12 +25,14 @@
43 SRC_URI=""
44 KEYWORDS=""
45 else
46 - SRC_URI="http://libvirt.org/sources/${P}.tar.gz
47 - ${BACKPORTS:+
48 - http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
49 - http://dev.gentoo.org/~cardoe/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
50 + SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
51 + ftp://libvirt.org/libvirt/${MY_P}.tar.gz
52 + ${BACKPORTS:+
53 + http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
54 + http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
55 KEYWORDS="~amd64 ~x86"
56 fi
57 +S="${WORKDIR}/${P%_rc*}"
58
59 DESCRIPTION="C toolkit to manipulate virtual machines"
60 HOMEPAGE="http://www.libvirt.org/"
61 @@ -38,14 +43,16 @@
62 uml virtualbox virt-network xen elibc_glibc"
63 # IUSE=one : bug #293416 & bug #299011
64
65 +# gettext.sh command is used by the libvirt command wrappers, and it's
66 +# non-optional, so put it into RDEPEND.
67 RDEPEND="sys-libs/readline
68 sys-libs/ncurses
69 >=net-misc/curl-7.18.0
70 >=dev-libs/libxml2-2.7.6
71 >=dev-libs/libnl-1.1
72 >=net-libs/gnutls-1.0.25
73 - sys-fs/sysfsutils
74 - sys-apps/util-linux
75 + >=sys-apps/util-linux-2.17
76 + sys-devel/gettext
77 >=net-analyzer/netcat6-1.0-r2
78 avahi? ( >=net-dns/avahi-0.6[dbus] )
79 caps? ( sys-libs/libcap-ng )
80 @@ -55,7 +62,7 @@
81 lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
82 macvtap? ( >=dev-libs/libnl-1.1 )
83 nfs? ( net-fs/nfs-utils )
84 - numa? ( sys-process/numactl )
85 + numa? ( >sys-process/numactl-2.0.2 )
86 openvz? ( sys-kernel/openvz-sources )
87 parted? (
88 >=sys-block/parted-1.8[device-mapper]
89 @@ -64,7 +71,7 @@
90 pcap? ( >=net-libs/libpcap-1.0.0 )
91 phyp? ( net-libs/libssh2 )
92 policykit? ( >=sys-auth/polkit-0.9 )
93 - qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 app-emulation/qemu-kvm-spice ) )
94 + qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
95 sasl? ( dev-libs/cyrus-sasl )
96 selinux? ( >=sys-libs/libselinux-2.0.85 )
97 virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
98 @@ -77,8 +84,7 @@
99 elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
100 # one? ( dev-libs/xmlrpc-c )
101 DEPEND="${RDEPEND}
102 - dev-util/pkgconfig
103 - nls? ( sys-devel/gettext )"
104 + dev-util/pkgconfig"
105
106 pkg_setup() {
107 python_set_active_version 2
108 @@ -89,16 +95,6 @@
109 EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
110 epatch
111
112 - # This is required to be able to run the tests when using the sandbox
113 - if [[ ${LD_PRELOAD} == libsandbox.so ]]; then
114 - sed -i -e '/LOGNAME/iENV:LD_PRELOAD=libsandbox.so' \
115 - "${S}"/tests/commanddata/*.log || die
116 - sed -i -e '/DISPLAY/aENV:LD_PRELOAD=libsandbox.so' \
117 - "${S}"/tests/commanddata/test6.log || die
118 - sed -i -e '/LANG/aENV:LD_PRELOAD=libsandbox.so' \
119 - "${S}"/tests/commanddata/test8.log || die
120 - fi
121 -
122 [[ -n ${AUTOTOOLIZE} ]] && eautoreconf
123 }
124
125 @@ -154,7 +150,7 @@
126 myconf="${myconf} $(use_with policykit polkit)"
127 myconf="${myconf} $(use_with sasl)"
128
129 - # network biits
130 + # network bits
131 myconf="${myconf} $(use_with macvtap)"
132 myconf="${myconf} $(use_with pcap libpcap)"
133
134 @@ -169,6 +165,9 @@
135 # we use udev over hal
136 myconf="${myconf} --without-hal"
137
138 + # locking support
139 + myconf="${myconf} --without-sanlock"
140 +
141 # this is a nasty trick to work around the problem in bug
142 # #275073. The reason why we don't solve this properly is that
143 # it'll require us to rebuild autotools (and we don't really want
144 @@ -230,7 +229,7 @@
145 }
146
147 pkg_postinst() {
148 - use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
149 + use python && python_mod_optimize libvirt.py
150
151 elog
152 if use policykit && has_version sys-auth/policykit; then
153 @@ -264,5 +263,5 @@
154 }
155
156 pkg_postrm() {
157 - use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
158 + use python && python_mod_cleanup libvirt.py
159 }
160
161
162
163 1.133 app-emulation/libvirt/ChangeLog
164
165 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.133&view=markup
166 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.133&content-type=text/plain
167 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?r1=1.132&r2=1.133
168
169 Index: ChangeLog
170 ===================================================================
171 RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v
172 retrieving revision 1.132
173 retrieving revision 1.133
174 diff -u -r1.132 -r1.133
175 --- ChangeLog 26 Aug 2011 09:40:57 -0000 1.132
176 +++ ChangeLog 31 Aug 2011 22:55:58 -0000 1.133
177 @@ -1,6 +1,11 @@
178 # ChangeLog for app-emulation/libvirt
179 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
180 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.132 2011/08/26 09:40:57 tomka Exp $
181 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.133 2011/08/31 22:55:58 cardoe Exp $
182 +
183 + 31 Aug 2011; Doug Goldstein <cardoe@g.o> -libvirt-0.9.1.ebuild,
184 + libvirt-0.9.4.ebuild, libvirt-9999.ebuild:
185 + Sync up the 0.9.4 and 9999 ebuilds. Remove the previous stable version as
186 + well.
187
188 26 Aug 2011; Thomas Kahle <tomka@g.o> libvirt-0.9.3-r1.ebuild:
189 x86 stable per bug 373991
190
191
192
193 1.4 app-emulation/libvirt/libvirt-0.9.4.ebuild
194
195 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-0.9.4.ebuild?rev=1.4&view=markup
196 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-0.9.4.ebuild?rev=1.4&content-type=text/plain
197 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-0.9.4.ebuild?r1=1.3&r2=1.4
198
199 Index: libvirt-0.9.4.ebuild
200 ===================================================================
201 RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.4.ebuild,v
202 retrieving revision 1.3
203 retrieving revision 1.4
204 diff -u -r1.3 -r1.4
205 --- libvirt-0.9.4.ebuild 4 Aug 2011 14:16:50 -0000 1.3
206 +++ libvirt-0.9.4.ebuild 31 Aug 2011 22:55:58 -0000 1.4
207 @@ -1,6 +1,6 @@
208 # Copyright 1999-2011 Gentoo Foundation
209 # Distributed under the terms of the GNU General Public License v2
210 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.4.ebuild,v 1.3 2011/08/04 14:16:50 cardoe Exp $
211 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.4.ebuild,v 1.4 2011/08/31 22:55:58 cardoe Exp $
212
213 #BACKPORTS=2
214 #AUTOTOOLIZE=yes
215 @@ -9,24 +9,35 @@
216
217 MY_P="${P/_rc/-rc}"
218
219 +if [[ ${PV} = *9999* ]]; then
220 + EGIT_REPO_URI="git://libvirt.org/libvirt.git"
221 + GIT_ECLASS="git-2"
222 + AUTOTOOLIZE=yes
223 +fi
224 +
225 PYTHON_DEPEND="python? 2:2.4"
226 #RESTRICT_PYTHON_ABIS="3.*"
227 #SUPPORT_PYTHON_ABIS="1"
228
229 -inherit eutils python ${AUTOTOOLIZE+autotools}
230 +inherit eutils python ${AUTOTOOLIZE+autotools} ${GIT_ECLASS}
231
232 -DESCRIPTION="C toolkit to manipulate virtual machines"
233 -HOMEPAGE="http://www.libvirt.org/"
234 -SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
235 - ftp://libvirt.org/libvirt/${MY_P}.tar.gz
236 - ${BACKPORTS:+
237 - http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
238 - http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
239 +if [[ ${PV} = *9999* ]]; then
240 + SRC_URI=""
241 + KEYWORDS=""
242 +else
243 + SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
244 + ftp://libvirt.org/libvirt/${MY_P}.tar.gz
245 + ${BACKPORTS:+
246 + http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
247 + http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
248 + KEYWORDS="~amd64 ~x86"
249 +fi
250 S="${WORKDIR}/${P%_rc*}"
251
252 +DESCRIPTION="C toolkit to manipulate virtual machines"
253 +HOMEPAGE="http://www.libvirt.org/"
254 LICENSE="LGPL-2.1"
255 SLOT="0"
256 -KEYWORDS="~amd64 ~x86"
257 IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
258 nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
259 uml virtualbox virt-network xen elibc_glibc"
260 @@ -40,7 +51,7 @@
261 >=dev-libs/libxml2-2.7.6
262 >=dev-libs/libnl-1.1
263 >=net-libs/gnutls-1.0.25
264 - sys-apps/util-linux
265 + >=sys-apps/util-linux-2.17
266 sys-devel/gettext
267 >=net-analyzer/netcat6-1.0-r2
268 avahi? ( >=net-dns/avahi-0.6[dbus] )
Report Message
Find on MARC Find on Google Groups