1 |
commit: 9029e1782621cfc4bb0af2dd1e8e0aa955a6cfb1 |
2 |
Author: Doug Goldstein <cardoe <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 6 05:59:21 2015 +0000 |
4 |
Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 6 20:19:45 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9029e178 |
7 |
|
8 |
app-emulation/xen-tools: multiple clean ups |
9 |
|
10 |
- switch to git from mercurial for live ebuild |
11 |
- improve description |
12 |
- add sub-slot to avoid ABI breaks when upgrading/downgrading |
13 |
- update inherit line |
14 |
- fix dependency on iproute2 |
15 |
- fix USE=-custom-cflags to not override some FLAGS |
16 |
- fix up Python dependencies |
17 |
|
18 |
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org> |
19 |
|
20 |
app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild | 53 ++++++++--------------- |
21 |
1 file changed, 19 insertions(+), 34 deletions(-) |
22 |
|
23 |
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild |
24 |
index b35cabe..7e33d7a 100644 |
25 |
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild |
26 |
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild |
27 |
@@ -4,17 +4,20 @@ |
28 |
|
29 |
EAPI=5 |
30 |
|
31 |
-MY_PV=${PV/_/-} |
32 |
- |
33 |
PYTHON_COMPAT=( python2_7 ) |
34 |
-PYTHON_REQ_USE='xml,threads' |
35 |
+PYTHON_REQ_USE='ncurses,xml,threads' |
36 |
+ |
37 |
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator |
38 |
+ |
39 |
+MY_PV=${PV/_/-} |
40 |
+MAJOR_V="$(get_version_component_range 1-2)" |
41 |
|
42 |
if [[ $PV == *9999 ]]; then |
43 |
+ inherit git-r3 |
44 |
KEYWORDS="" |
45 |
- REPO="xen-unstable.hg" |
46 |
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" |
47 |
+ REPO="xen.git" |
48 |
+ EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" |
49 |
S="${WORKDIR}/${REPO}" |
50 |
- live_eclass="mercurial" |
51 |
else |
52 |
KEYWORDS="~amd64 ~arm ~arm64 -x86" |
53 |
UPSTREAM_VER=0 |
54 |
@@ -51,14 +54,12 @@ else |
55 |
S="${WORKDIR}/xen-${MY_PV}" |
56 |
fi |
57 |
|
58 |
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs ${live_eclass} |
59 |
- |
60 |
-DESCRIPTION="Xend daemon and tools" |
61 |
+DESCRIPTION="Xen tools including QEMU and xl" |
62 |
HOMEPAGE="http://xen.org/" |
63 |
DOCS=( README docs/README.xen-bugtool ) |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
-SLOT="0" |
67 |
+SLOT="0/${MAJOR_V}" |
68 |
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
69 |
# >=dev-lang/ocaml-4 stable |
70 |
# Masked in profiles/eapi-5-files instead |
71 |
@@ -85,7 +86,6 @@ DEPEND="${COMMON_DEPEND} |
72 |
${PYTHON_DEPS} |
73 |
api? ( dev-libs/libxml2 |
74 |
net-misc/curl ) |
75 |
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
76 |
ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} ) |
77 |
!amd64? ( >=sys-apps/dtc-1.4.0 ) |
78 |
amd64? ( sys-devel/bin86 |
79 |
@@ -120,7 +120,7 @@ DEPEND="${COMMON_DEPEND} |
80 |
>=dev-lang/ocaml-4 )" |
81 |
|
82 |
RDEPEND="${COMMON_DEPEND} |
83 |
- sys-apps/iproute2 |
84 |
+ sys-apps/iproute2[-minimal] |
85 |
net-misc/bridge-utils |
86 |
screen? ( |
87 |
app-misc/screen |
88 |
@@ -263,6 +263,11 @@ src_prepare() { |
89 |
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
90 |
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
91 |
-i {} + || die "failed to re-set custom-cflags" |
92 |
+ else |
93 |
+ unset CFLAGS |
94 |
+ unset LDFLAGS |
95 |
+ unset ASFLAGS |
96 |
+ unset CPPFLAGS |
97 |
fi |
98 |
|
99 |
if ! use pygrub; then |
100 |
@@ -344,7 +349,9 @@ src_configure() { |
101 |
$(use_enable api xenapi) \ |
102 |
$(use_enable ovmf) \ |
103 |
$(use_enable ocaml ocamltools) \ |
104 |
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ |
105 |
" |
106 |
+ |
107 |
use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" |
108 |
use qemu || myconf+=" --with-system-qemu" |
109 |
use amd64 && myconf+=" --enable-qemu-traditional" |
110 |
@@ -356,13 +363,10 @@ src_compile() { |
111 |
local myopt |
112 |
use debug && myopt="${myopt} debug=y" |
113 |
|
114 |
- use custom-cflags || unset CFLAGS |
115 |
if test-flag-CC -fno-strict-overflow; then |
116 |
append-flags -fno-strict-overflow |
117 |
fi |
118 |
|
119 |
- unset LDFLAGS |
120 |
- unset CFLAGS |
121 |
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
122 |
|
123 |
use doc && emake -C docs txt html |
124 |
@@ -437,19 +441,6 @@ pkg_postinst() { |
125 |
elog "Recommended to utilise the xencommons script to config sytem At boot" |
126 |
elog "Add by use of rc-update on completion of the install" |
127 |
|
128 |
- # TODO: we need to have the current Python slot here. |
129 |
- if ! has_version "dev-lang/python[ncurses]"; then |
130 |
- echo |
131 |
- ewarn "NB: Your dev-lang/python is built without USE=ncurses." |
132 |
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." |
133 |
- fi |
134 |
- |
135 |
- if has_version "sys-apps/iproute2[minimal]"; then |
136 |
- echo |
137 |
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" |
138 |
- ewarn "will not work until you rebuild iproute2 without USE=minimal." |
139 |
- fi |
140 |
- |
141 |
if ! use hvm; then |
142 |
echo |
143 |
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" |
144 |
@@ -463,10 +454,4 @@ pkg_postinst() { |
145 |
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" |
146 |
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" |
147 |
fi |
148 |
- |
149 |
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then |
150 |
- echo |
151 |
- elog "xensv is broken upstream (Gentoo bug #142011)." |
152 |
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." |
153 |
- fi |
154 |
} |