1 |
cardoe 13/07/30 13:22:46 |
2 |
|
3 |
Modified: libvirt-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Update live ebuild to latest iteration of the ebuild |
6 |
|
7 |
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.50 app-emulation/libvirt/libvirt-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.50&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.50&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?r1=1.49&r2=1.50 |
15 |
|
16 |
Index: libvirt-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v |
19 |
retrieving revision 1.49 |
20 |
retrieving revision 1.50 |
21 |
diff -u -r1.49 -r1.50 |
22 |
--- libvirt-9999.ebuild 9 Jun 2013 22:42:04 -0000 1.49 |
23 |
+++ libvirt-9999.ebuild 30 Jul 2013 13:22:46 -0000 1.50 |
24 |
@@ -1,19 +1,17 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.49 2013/06/09 22:42:04 cardoe Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.50 2013/07/30 13:22:46 cardoe Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
-#BACKPORTS=9bf6bec4 |
33 |
+#BACKPORTS=cafcec2f |
34 |
AUTOTOOLIZE=yes |
35 |
|
36 |
MY_P="${P/_rc/-rc}" |
37 |
|
38 |
-PYTHON_DEPEND="python? 2:2.5" |
39 |
-#RESTRICT_PYTHON_ABIS="3.*" |
40 |
-#SUPPORT_PYTHON_ABIS="1" |
41 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7} ) |
42 |
|
43 |
-inherit eutils python user autotools linux-info |
44 |
+inherit eutils python-single-r1 user autotools linux-info systemd |
45 |
|
46 |
if [[ ${PV} = *9999* ]]; then |
47 |
inherit git-2 |
48 |
@@ -34,9 +32,10 @@ |
49 |
HOMEPAGE="http://www.libvirt.org/" |
50 |
LICENSE="LGPL-2.1" |
51 |
SLOT="0" |
52 |
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm +lxc +macvtap nfs \ |
53 |
- nls numa openvz parted pcap phyp policykit python qemu rbd sasl \ |
54 |
- selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc" |
55 |
+IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \ |
56 |
+ nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \ |
57 |
+ selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \ |
58 |
+ systemd" |
59 |
REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) |
60 |
lxc? ( caps libvirtd ) |
61 |
openvz? ( libvirtd ) |
62 |
@@ -46,7 +45,8 @@ |
63 |
virtualbox? ( libvirtd ) |
64 |
xen? ( libvirtd ) |
65 |
virt-network? ( libvirtd ) |
66 |
- firewalld? ( virt-network )" |
67 |
+ firewalld? ( virt-network ) |
68 |
+ python? ( ${PYTHON_REQUIRED_USE} )" |
69 |
|
70 |
# gettext.sh command is used by the libvirt command wrappers, and it's |
71 |
# non-optional, so put it into RDEPEND. |
72 |
@@ -85,6 +85,7 @@ |
73 |
) |
74 |
pcap? ( >=net-libs/libpcap-1.0.0 ) |
75 |
policykit? ( >=sys-auth/polkit-0.9 ) |
76 |
+ python? ( ${PYTHON_DEPS} ) |
77 |
qemu? ( |
78 |
>=app-emulation/qemu-0.13.0 |
79 |
dev-libs/yajl |
80 |
@@ -108,8 +109,8 @@ |
81 |
DEPEND="${RDEPEND} |
82 |
virtual/pkgconfig |
83 |
app-text/xhtml1 |
84 |
- dev-libs/libxslt |
85 |
- =dev-lang/python-2*" |
86 |
+ dev-lang/perl |
87 |
+ dev-libs/libxslt" |
88 |
|
89 |
LXC_CONFIG_CHECK=" |
90 |
~CGROUPS |
91 |
@@ -151,9 +152,6 @@ |
92 |
MACVTAP_CONFIG_CHECK="~MACVTAP" |
93 |
|
94 |
pkg_setup() { |
95 |
- python_set_active_version 2 |
96 |
- python_pkg_setup |
97 |
- |
98 |
enewgroup qemu 77 |
99 |
enewuser qemu 77 -1 -1 qemu kvm |
100 |
|
101 |
@@ -165,11 +163,11 @@ |
102 |
gpasswd -a qemu kvm |
103 |
fi |
104 |
|
105 |
+ python-single-r1_pkg_setup |
106 |
+ |
107 |
# Handle specific kernel versions for different features |
108 |
- kernel_is lt 3 5 && LXC_CONFIG_CHECK+=" ~USER_NS" |
109 |
kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
110 |
kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM" |
111 |
- kernel_is ge 3 8 && LXC_CONFIG_CHECK+=" ~USER_NS" |
112 |
|
113 |
CONFIG_CHECK="" |
114 |
use fuse && CONFIG_CHECK+=" ~FUSE_FS" |
115 |
@@ -305,6 +303,9 @@ |
116 |
# locking support |
117 |
myconf="${myconf} --without-sanlock" |
118 |
|
119 |
+ # systemd unit files |
120 |
+ use systemd && myconf="${myconf} --with-init-script=systemd" |
121 |
+ |
122 |
# this is a nasty trick to work around the problem in bug |
123 |
# #275073. The reason why we don't solve this properly is that |
124 |
# it'll require us to rebuild autotools (and we don't really want |
125 |
@@ -343,8 +344,9 @@ |
126 |
emake install \ |
127 |
DESTDIR="${D}" \ |
128 |
HTML_DIR=/usr/share/doc/${PF}/html \ |
129 |
- DOCS_DIR=/usr/share/doc/${PF}/python \ |
130 |
- EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \ |
131 |
+ DOCS_DIR=/usr/share/doc/${PF} \ |
132 |
+ EXAMPLE_DIR=/usr/share/doc/${PF}/examples \ |
133 |
+ SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \ |
134 |
|| die "emake install failed" |
135 |
|
136 |
find "${D}" -name '*.la' -delete || die |
137 |
@@ -356,6 +358,8 @@ |
138 |
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die |
139 |
|
140 |
keepdir /var/lib/libvirt/images |
141 |
+ |
142 |
+ use python && python_optimize |
143 |
} |
144 |
|
145 |
pkg_preinst() { |
146 |
@@ -371,12 +375,10 @@ |
147 |
fi |
148 |
|
149 |
# Only sysctl files ending in .conf work |
150 |
- mv "${D}"/usr/lib/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf |
151 |
+ mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf |
152 |
} |
153 |
|
154 |
pkg_postinst() { |
155 |
- use python && python_mod_optimize libvirt.py |
156 |
- |
157 |
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then |
158 |
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml |
159 |
fi |
160 |
@@ -423,7 +425,3 @@ |
161 |
elog "Ensure any resources your VMs use are accessible by qemu:qemu" |
162 |
fi |
163 |
} |
164 |
- |
165 |
-pkg_postrm() { |
166 |
- use python && python_mod_cleanup libvirt.py |
167 |
-} |
168 |
|
169 |
|
170 |
|
171 |
1.300 app-emulation/libvirt/ChangeLog |
172 |
|
173 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.300&view=markup |
174 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.300&content-type=text/plain |
175 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?r1=1.299&r2=1.300 |
176 |
|
177 |
Index: ChangeLog |
178 |
=================================================================== |
179 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v |
180 |
retrieving revision 1.299 |
181 |
retrieving revision 1.300 |
182 |
diff -u -r1.299 -r1.300 |
183 |
--- ChangeLog 30 Jul 2013 13:17:51 -0000 1.299 |
184 |
+++ ChangeLog 30 Jul 2013 13:22:46 -0000 1.300 |
185 |
@@ -1,6 +1,9 @@ |
186 |
# ChangeLog for app-emulation/libvirt |
187 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
188 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.299 2013/07/30 13:17:51 cardoe Exp $ |
189 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.300 2013/07/30 13:22:46 cardoe Exp $ |
190 |
+ |
191 |
+ 30 Jul 2013; Doug Goldstein <cardoe@g.o> libvirt-9999.ebuild: |
192 |
+ Update live ebuild to latest iteration of the ebuild |
193 |
|
194 |
*libvirt-1.1.1 (30 Jul 2013) |