1 |
commit: eced2e3ab130ab3dcd346160d77c6d196739bea4 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 19 20:08:42 2017 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 19 20:10:21 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eced2e3a |
7 |
|
8 |
app-emulation/libguestfs: bump to EAPI6 |
9 |
|
10 |
The EAPI bump also happens to address the globbing of patches that caused |
11 |
bug 623516 |
12 |
|
13 |
Bug: http://bugs.gentoo.org/623516 |
14 |
|
15 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
16 |
|
17 |
....28.5-r2.ebuild => libguestfs-1.28.5-r3.ebuild} | 64 ++++++++-------------- |
18 |
1 file changed, 24 insertions(+), 40 deletions(-) |
19 |
|
20 |
diff --git a/app-emulation/libguestfs/libguestfs-1.28.5-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.28.5-r3.ebuild |
21 |
similarity index 79% |
22 |
rename from app-emulation/libguestfs/libguestfs-1.28.5-r2.ebuild |
23 |
rename to app-emulation/libguestfs/libguestfs-1.28.5-r3.ebuild |
24 |
index b2059211770..44eebef32e9 100644 |
25 |
--- a/app-emulation/libguestfs/libguestfs-1.28.5-r2.ebuild |
26 |
+++ b/app-emulation/libguestfs/libguestfs-1.28.5-r3.ebuild |
27 |
@@ -1,15 +1,13 @@ |
28 |
-# Copyright 1999-2016 Gentoo Foundation |
29 |
+# Copyright 1999-2017 Gentoo Foundation |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
|
32 |
-EAPI="5" |
33 |
+EAPI=6 |
34 |
|
35 |
WANT_LIBTOOL=latest |
36 |
WANT_AUTOMAKE=1.14 |
37 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
38 |
PYTHON_COMPAT=( python{2_7,3_{4,5}} ) |
39 |
|
40 |
-inherit python-single-r1 autotools-utils autotools versionator eutils \ |
41 |
-multilib linux-info perl-module base |
42 |
+inherit python-single-r1 autotools versionator linux-info perl-module |
43 |
|
44 |
MY_PV_1="$(get_version_component_range 1-2)" |
45 |
MY_PV_2="$(get_version_component_range 2)" |
46 |
@@ -48,54 +46,52 @@ COMMON_DEPEND=" |
47 |
>=app-admin/augeas-1.0.0 |
48 |
sys-fs/squashfs-tools:* |
49 |
dev-libs/libconfig |
50 |
- sys-libs/readline:= |
51 |
+ sys-libs/readline:0= |
52 |
>=sys-libs/db-4.6:* |
53 |
app-arch/xz-utils |
54 |
app-arch/lzma |
55 |
app-crypt/gnupg |
56 |
app-arch/unzip[natspec] |
57 |
perl? ( virtual/perl-ExtUtils-MakeMaker |
58 |
- >=dev-perl/Sys-Virt-0.2.4 |
59 |
- virtual/perl-Getopt-Long |
60 |
- virtual/perl-Data-Dumper |
61 |
- dev-perl/libintl-perl |
62 |
- >=app-misc/hivex-1.3.1[perl?] |
63 |
- dev-perl/String-ShellQuote |
64 |
- ) |
65 |
+ >=dev-perl/Sys-Virt-0.2.4 |
66 |
+ virtual/perl-Getopt-Long |
67 |
+ virtual/perl-Data-Dumper |
68 |
+ dev-perl/libintl-perl |
69 |
+ >=app-misc/hivex-1.3.1[perl?] |
70 |
+ dev-perl/String-ShellQuote |
71 |
+ ) |
72 |
python? ( ${PYTHON_DEPS} ) |
73 |
- fuse? ( sys-fs/fuse ) |
74 |
+ fuse? ( sys-fs/fuse:= ) |
75 |
introspection? ( |
76 |
>=dev-libs/gobject-introspection-1.30.0:= |
77 |
dev-libs/gjs |
78 |
- ) |
79 |
+ ) |
80 |
selinux? ( sys-libs/libselinux sys-libs/libsemanage ) |
81 |
systemtap? ( dev-util/systemtap ) |
82 |
ocaml? ( dev-lang/ocaml[ocamlopt] |
83 |
- dev-ml/findlib[ocamlopt] |
84 |
- dev-ml/ocaml-gettext |
85 |
- ) |
86 |
+ dev-ml/findlib[ocamlopt] |
87 |
+ dev-ml/ocaml-gettext |
88 |
+ ) |
89 |
erlang? ( dev-lang/erlang ) |
90 |
inspect-icons? ( media-libs/netpbm |
91 |
- media-gfx/icoutils |
92 |
- ) |
93 |
+ media-gfx/icoutils |
94 |
+ ) |
95 |
virtual/acl |
96 |
sys-libs/libcap |
97 |
lua? ( dev-lang/lua:* ) |
98 |
>=app-shells/bash-completion-2.0 |
99 |
- dev-libs/yajl" |
100 |
+ dev-libs/yajl |
101 |
+ " |
102 |
|
103 |
DEPEND="${COMMON_DEPEND} |
104 |
dev-util/gperf |
105 |
doc? ( app-text/po4a ) |
106 |
ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) |
107 |
- ${AUTOTOOLS_DEPEND} |
108 |
" |
109 |
RDEPEND="${COMMON_DEPEND} |
110 |
app-emulation/libguestfs-appliance |
111 |
" |
112 |
|
113 |
-PATCHES=( "${FILESDIR}/${MY_PV_1}"/*.patch ) |
114 |
- |
115 |
DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) |
116 |
|
117 |
pkg_setup () { |
118 |
@@ -106,14 +102,14 @@ pkg_setup () { |
119 |
} |
120 |
|
121 |
src_prepare() { |
122 |
- base_src_prepare |
123 |
+ eapply "${FILESDIR}"/${MY_PV_1} |
124 |
+ eapply_user |
125 |
eaclocal |
126 |
eautomake |
127 |
eautoconf |
128 |
} |
129 |
|
130 |
src_configure() { |
131 |
- |
132 |
# Disable feature test for kvm for more reason |
133 |
# i.e: not loaded module in __build__ time, |
134 |
# build server not supported kvm, etc. ... |
135 |
@@ -122,7 +118,7 @@ src_configure() { |
136 |
# configured kernel. |
137 |
export vmchannel_test=no |
138 |
|
139 |
- local myeconfargs=( |
140 |
+ econf \ |
141 |
$(use_enable test werror) |
142 |
--with-libvirt |
143 |
--with-default-backend=libvirt |
144 |
@@ -143,28 +139,16 @@ src_configure() { |
145 |
$(use_enable erlang) |
146 |
$(use_enable systemtap probes) |
147 |
$(use_enable lua) |
148 |
- ) |
149 |
- autotools-utils_src_configure |
150 |
-} |
151 |
- |
152 |
-src_compile() { |
153 |
- autotools-utils_src_compile |
154 |
- |
155 |
-} |
156 |
- |
157 |
-src_test() { |
158 |
- autotools-utils_src_test |
159 |
} |
160 |
|
161 |
src_install() { |
162 |
strip-linguas -i po |
163 |
- autotools-utils_src_install "LINGUAS=""${LINGUAS}""" |
164 |
+ emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}""" |
165 |
|
166 |
use perl && perl_delete_localpod |
167 |
} |
168 |
|
169 |
pkg_postinst() { |
170 |
- |
171 |
if ! use perl ; then |
172 |
einfo "Perl based tools NOT build" |
173 |
fi |