Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libxml2: libxml2-2.9.0.ebuild ChangeLog
Date: Tue, 27 Nov 2012 05:44:04
Message-Id: 20121127054354.4C15B20C9F@flycatcher.gentoo.org
1 tetromino 12/11/27 05:43:54
2
3 Modified: ChangeLog
4 Added: libxml2-2.9.0.ebuild
5 Log:
6 Version bump featuring improved push parser and XPath evaluation (bug #444290). Update to EAPI5, always install docs in a devhelp-compatible location following current gnome team style guidelines, and run a more complete test suite.
7
8 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
9
10 Revision Changes Path
11 1.364 dev-libs/libxml2/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/ChangeLog?rev=1.364&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/ChangeLog?rev=1.364&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/ChangeLog?r1=1.363&r2=1.364
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v
20 retrieving revision 1.363
21 retrieving revision 1.364
22 diff -u -r1.363 -r1.364
23 --- ChangeLog 26 Nov 2012 19:56:27 -0000 1.363
24 +++ ChangeLog 27 Nov 2012 05:43:54 -0000 1.364
25 @@ -1,6 +1,20 @@
26 # ChangeLog for dev-libs/libxml2
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.363 2012/11/26 19:56:27 tetromino Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.364 2012/11/27 05:43:54 tetromino Exp $
30 +
31 +*libxml2-2.9.0 (27 Nov 2012)
32 +
33 + 27 Nov 2012; Alexandre Rostovtsev <tetromino@g.o>
34 + +libxml2-2.9.0.ebuild, +files/libxml2-2.9.0-disable_static_modules.patch,
35 + +files/libxml2-2.9.0-large-file-parse.patch,
36 + +files/libxml2-2.9.0-nsclean.patch, +files/libxml2-2.9.0-rand_seed.patch,
37 + +files/libxml2-2.9.0-streaming-validation.patch,
38 + +files/libxml2-2.9.0-thread-alloc.patch,
39 + +files/libxml2-2.9.0-thread-portability.patch:
40 + Version bump featuring improved push parser and XPath evaluation (bug
41 + #444290). Update to EAPI5, always install docs in a devhelp-compatible
42 + location following current gnome team style guidelines, and run a more
43 + complete test suite.
44
45 26 Nov 2012; Alexandre Rostovtsev <tetromino@g.o>
46 libxml2-2.8.0-r3.ebuild:
47
48
49
50 1.1 dev-libs/libxml2/libxml2-2.9.0.ebuild
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/libxml2-2.9.0.ebuild?rev=1.1&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/libxml2-2.9.0.ebuild?rev=1.1&content-type=text/plain
54
55 Index: libxml2-2.9.0.ebuild
56 ===================================================================
57 # Copyright 1999-2012 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.0.ebuild,v 1.1 2012/11/27 05:43:54 tetromino Exp $
60
61 EAPI="5"
62 PYTHON_DEPEND="python? 2"
63 PYTHON_USE_WITH="xml"
64 PYTHON_USE_WITH_OPT="python"
65 SUPPORT_PYTHON_ABIS="1"
66 RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
67
68 inherit libtool flag-o-matic eutils python autotools prefix
69
70 DESCRIPTION="Version 2 of the library to manipulate XML files"
71 HOMEPAGE="http://www.xmlsoft.org/"
72
73 LICENSE="MIT"
74 SLOT="2"
75 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
76 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
77
78 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
79 XSTS_NAME_1="xmlschema2002-01-16"
80 XSTS_NAME_2="xmlschema2004-01-14"
81 XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
82 XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
83 XMLCONF_TARBALL="xmlts20080827.tar.gz"
84
85 SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
86 test? (
87 ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
88 ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
89 http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
90
91 RDEPEND="sys-libs/zlib
92 icu? ( dev-libs/icu )
93 lzma? ( app-arch/xz-utils )
94 readline? ( sys-libs/readline )"
95
96 DEPEND="${RDEPEND}
97 dev-util/gtk-doc-am
98 hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
99
100 S="${WORKDIR}/${PN}-${PV%_rc*}"
101
102 pkg_setup() {
103 use python && python_pkg_setup
104 }
105
106 src_unpack() {
107 # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
108 # as they are needed as tarballs in ${S}/xstc instead and not unpacked
109 unpack ${P/_rc/-rc}.tar.gz
110 cd "${S}"
111
112 if use test; then
113 cp "${DISTDIR}/${XSTS_TARBALL_1}" \
114 "${DISTDIR}/${XSTS_TARBALL_2}" \
115 "${S}"/xstc/ \
116 || die "Failed to install test tarballs"
117 unpack ${XMLCONF_TARBALL}
118 fi
119 }
120
121 src_prepare() {
122 # Patches needed for prefix support
123 epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
124 epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
125
126 eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
127
128 epunt_cxx
129
130 epatch "${FILESDIR}/${PN}-2.9.0-disable_static_modules.patch"
131
132 # Important patches from 2.9.1
133 epatch "${FILESDIR}/${P}-rand_seed.patch" \
134 "${FILESDIR}/${P}-thread-portability.patch" \
135 "${FILESDIR}/${P}-streaming-validation.patch" \
136 "${FILESDIR}/${P}-nsclean.patch" \
137 "${FILESDIR}/${P}-large-file-parse.patch" \
138 "${FILESDIR}/${P}-thread-alloc.patch"
139
140 # Buffer underflow in xmlParseAttValueComplex, bug #444836; fixed in 2.9.1
141 epatch "${FILESDIR}/${PN}-2.8.0-xmlParseAttValueComplex-underflow.patch"
142
143 # Please do not remove, as else we get references to PORTAGE_TMPDIR
144 # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
145 # We now need to run eautoreconf at the end to prevent maintainer mode.
146 # elibtoolize
147
148 # Python bindings are built/tested/installed manually.
149 sed -e 's/$(PYTHON_SUBDIR)//' -i Makefile.am || die "sed 1 failed"
150
151 # Use Gentoo's python-config naming scheme
152 sed -e 's/python$PYTHON_VERSION-config/python-config-$PYTHON_VERSION/' \
153 -i configure.in || die "sed 2 failed"
154
155 eautoreconf
156 }
157
158 src_configure() {
159 # USE zlib support breaks gnome2
160 # (libgnomeprint for instance fails to compile with
161 # fresh install, and existing) - <azarah@g.o> (22 Dec 2002).
162
163 # The meaning of the 'debug' USE flag does not apply to the --with-debug
164 # switch (enabling the libxml2 debug module). See bug #100898.
165
166 # --with-mem-debug causes unusual segmentation faults (bug #105120).
167
168 local myconf=(
169 --with-html-subdir=${PF}/html
170 --docdir="${EPREFIX}/usr/share/doc/${PF}"
171 $(use_with debug run-debug)
172 $(use_with icu)
173 $(use_with lzma)
174 $(use_with python)
175 $(use_with readline)
176 $(use_with readline history)
177 $(use_enable ipv6)
178 $(use_enable static-libs static) )
179
180 # filter seemingly problematic CFLAGS (#26320)
181 filter-flags -fprefetch-loop-arrays -funroll-loops
182
183 econf "${myconf[@]}"
184 }
185
186 src_compile() {
187 default
188
189 if use python; then
190 python_copy_sources python
191 building() {
192 emake PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \
193 PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)"
194 }
195 python_execute_function -s --source-dir python building
196 fi
197 }
198
199 src_test() {
200 default
201
202 if use python; then
203 testing() {
204 emake test
205 }
206 python_execute_function -s --source-dir python testing
207 fi
208 }
209
210 src_install() {
211 emake DESTDIR="${D}" \
212 EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
213 install || die "Installation failed"
214
215 # on windows, xmllint is installed by interix libxml2 in parent prefix.
216 # this is the version to use. the native winnt version does not support
217 # symlinks, which makes repoman fail if the portage tree is linked in
218 # from another location (which is my default). -- mduft
219 if [[ ${CHOST} == *-winnt* ]]; then
220 rm -rf "${ED}"/usr/bin/xmllint
221 rm -rf "${ED}"/usr/bin/xmlcatalog
222 fi
223
224 if use python; then
225 installation() {
226 emake DESTDIR="${D}" \
227 PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
228 docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
229 exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
230 install
231 }
232 python_execute_function -s --source-dir python installation
233
234 python_clean_installation_image
235 fi
236
237 rm -rf "${ED}"/usr/share/doc/${P}
238 dodoc AUTHORS ChangeLog Copyright NEWS README* TODO*
239
240 if ! use python; then
241 rm -rf "${ED}"/usr/share/doc/${PF}/python
242 rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
243 fi
244
245 if ! use examples; then
246 rm -rf "${ED}/usr/share/doc/${PF}/examples"
247 rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
248 fi
249
250 prune_libtool_files
251 }
252
253 pkg_postinst() {
254 if use python; then
255 python_mod_optimize drv_libxml2.py libxml2.py
256 fi
257
258 # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
259 # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
260 if [ "${ROOT}" != "/" ]
261 then
262 elog "Skipping XML catalog creation for stage building (bug #208887)."
263 else
264 # need an XML catalog, so no-one writes to a non-existent one
265 CATALOG="${EROOT}etc/xml/catalog"
266
267 # we dont want to clobber an existing catalog though,
268 # only ensure that one is there
269 # <obz@g.o>
270 if [ ! -e ${CATALOG} ]; then
271 [ -d "${EROOT}etc/xml" ] || mkdir -p "${EROOT}etc/xml"
272 "${EPREFIX}"/usr/bin/xmlcatalog --create > ${CATALOG}
273 einfo "Created XML catalog in ${CATALOG}"
274 fi
275 fi
276 }
277
278 pkg_postrm() {
279 if use python; then
280 python_mod_cleanup drv_libxml2.py libxml2.py
281 fi
282 }