Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 352961 | Differences between
and this patch

Collapse All | Expand All

(-)libxml2-2.7.7.ebuild (-14 / +29 lines)
Lines 2-12 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.7.ebuild,v 1.14 2010/12/31 23:49:15 arfrever Exp $
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.7.ebuild,v 1.14 2010/12/31 23:49:15 arfrever Exp $
4
4
5
EAPI="2"
5
EAPI="3"
6
SUPPORT_PYTHON_ABIS="1"
6
SUPPORT_PYTHON_ABIS="1"
7
RESTRICT_PYTHON_ABIS="3.* *-jython"
7
RESTRICT_PYTHON_ABIS="3.* *-jython"
8
8
9
inherit libtool flag-o-matic eutils python
9
inherit libtool flag-o-matic eutils python autotools
10
10
11
DESCRIPTION="Version 2 of the library to manipulate XML files"
11
DESCRIPTION="Version 2 of the library to manipulate XML files"
12
HOMEPAGE="http://www.xmlsoft.org/"
12
HOMEPAGE="http://www.xmlsoft.org/"
Lines 14-20 Link Here
14
LICENSE="MIT"
14
LICENSE="MIT"
15
SLOT="2"
15
SLOT="2"
16
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
16
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
17
IUSE="debug doc examples ipv6 python readline test"
17
IUSE="debug doc examples icu ipv6 python readline test"
18
18
19
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
19
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
20
XSTS_NAME_1="xmlschema2002-01-16"
20
XSTS_NAME_1="xmlschema2002-01-16"
Lines 28-33 Link Here
28
		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
28
		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
29
29
30
RDEPEND="sys-libs/zlib
30
RDEPEND="sys-libs/zlib
31
	icu? ( dev-libs/icu )
31
	python? ( || ( <dev-lang/python-3[xml] ( <dev-lang/python-3 dev-python/pyxml ) ) )
32
	python? ( || ( <dev-lang/python-3[xml] ( <dev-lang/python-3 dev-python/pyxml ) ) )
32
	readline? ( sys-libs/readline )"
33
	readline? ( sys-libs/readline )"
33
34
Lines 57-68 Link Here
57
src_prepare() {
58
src_prepare() {
58
	epunt_cxx
59
	epunt_cxx
59
60
61
	# Reactivate the shared library versionning script
62
	epatch "${FILESDIR}/${P}-reactivate-script.patch"
63
64
	# Fix a potential memory access error
65
	epatch "${FILESDIR}/${P}-xpath-memory.patch"
66
67
	# Fix a potential freeing error in XPath
68
	epatch "${FILESDIR}/${P}-xpath-freeing.patch"
69
	epatch "${FILESDIR}/${P}-xpath-freeing2.patch"
70
60
	# Please do not remove, as else we get references to PORTAGE_TMPDIR
71
	# Please do not remove, as else we get references to PORTAGE_TMPDIR
61
	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
72
	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
62
	elibtoolize
73
	# We now need to run eautoreconf at the end to prevent maintainer mode.
74
#	elibtoolize
63
75
64
	# Python bindings are built/tested/installed manually.
76
	# Python bindings are built/tested/installed manually.
65
	sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.in || die "sed failed"
77
	sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.in || die "sed failed"
78
79
	eautoreconf
66
}
80
}
67
81
68
src_configure() {
82
src_configure() {
Lines 79-84 Link Here
79
		--with-html-subdir=${PF}/html
93
		--with-html-subdir=${PF}/html
80
		--docdir=/usr/share/doc/${PF}
94
		--docdir=/usr/share/doc/${PF}
81
		$(use_with debug run-debug)
95
		$(use_with debug run-debug)
96
		$(use_with icu)
82
		$(use_with python)
97
		$(use_with python)
83
		$(use_with readline)
98
		$(use_with readline)
84
		$(use_with readline history)
99
		$(use_with readline history)
Lines 132-153 Link Here
132
		python_clean_installation_image
147
		python_clean_installation_image
133
	fi
148
	fi
134
149
135
	rm -rf "${D}"/usr/share/doc/${P}
150
	rm -rf "${ED}"/usr/share/doc/${P}
136
	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
151
	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
137
152
138
	if ! use python; then
153
	if ! use python; then
139
		rm -rf "${D}"/usr/share/doc/${PF}/python
154
		rm -rf "${ED}"/usr/share/doc/${PF}/python
140
		rm -rf "${D}"/usr/share/doc/${PN}-python-${PV}
155
		rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
141
	fi
156
	fi
142
157
143
	if ! use doc; then
158
	if ! use doc; then
144
		rm -rf "${D}"/usr/share/gtk-doc
159
		rm -rf "${ED}"/usr/share/gtk-doc
145
		rm -rf "${D}"/usr/share/doc/${PF}/html
160
		rm -rf "${ED}"/usr/share/doc/${PF}/html
146
	fi
161
	fi
147
162
148
	if ! use examples; then
163
	if ! use examples; then
149
		rm -rf "${D}/usr/share/doc/${PF}/examples"
164
		rm -rf "${ED}/usr/share/doc/${PF}/examples"
150
		rm -rf "${D}/usr/share/doc/${PF}/python/examples"
165
		rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
151
	fi
166
	fi
152
}
167
}
153
168
Lines 158-175 Link Here
158
173
159
	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
174
	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
160
	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
175
	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
161
	if [ "${ROOT}" != "/" ]
176
	if [ "${EROOT}" != "/" ]
162
	then
177
	then
163
		elog "Skipping XML catalog creation for stage building (bug #208887)."
178
		elog "Skipping XML catalog creation for stage building (bug #208887)."
164
	else
179
	else
165
		# need an XML catalog, so no-one writes to a non-existent one
180
		# need an XML catalog, so no-one writes to a non-existent one
166
		CATALOG="${ROOT}etc/xml/catalog"
181
		CATALOG="${EROOT}etc/xml/catalog"
167
182
168
		# we dont want to clobber an existing catalog though,
183
		# we dont want to clobber an existing catalog though,
169
		# only ensure that one is there
184
		# only ensure that one is there
170
		# <obz@gentoo.org>
185
		# <obz@gentoo.org>
171
		if [ ! -e ${CATALOG} ]; then
186
		if [ ! -e ${CATALOG} ]; then
172
			[ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml"
187
			[ -d "${EROOT}etc/xml" ] || mkdir -p "${EROOT}etc/xml"
173
			/usr/bin/xmlcatalog --create > ${CATALOG}
188
			/usr/bin/xmlcatalog --create > ${CATALOG}
174
			einfo "Created XML catalog in ${CATALOG}"
189
			einfo "Created XML catalog in ${CATALOG}"
175
		fi
190
		fi

Return to bug 352961