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

Collapse All | Expand All

(-)libxml2-2.7.8.ebuild (-12 / +26 lines)
Lines 6-19 Link Here
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 autotools
9
inherit libtool flag-o-matic eutils python autotools prefix
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/"
13
13
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="~ppc-aix ~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"
17
IUSE="debug doc examples icu 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"
Lines 56-61 Link Here
56
}
56
}
57
57
58
src_prepare() {
58
src_prepare() {
59
	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
60
	epatch "${FILESDIR}"/${PN}-2.7.2-winnt.patch
61
62
	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
63
59
	epunt_cxx
64
	epunt_cxx
60
65
61
	# Reactivate the shared library versionning script
66
	# Reactivate the shared library versionning script
Lines 89-97 Link Here
89
94
90
	# --with-mem-debug causes unusual segmentation faults (bug #105120).
95
	# --with-mem-debug causes unusual segmentation faults (bug #105120).
91
96
92
	local myconf="--with-zlib
97
	local myconf="--with-zlib=${EPREFIX}/usr
93
		--with-html-subdir=${PF}/html
98
		--with-html-subdir=${PF}/html
94
		--docdir=/usr/share/doc/${PF}
99
		--docdir=${EPREFIX}/usr/share/doc/${PF}
95
		$(use_with debug run-debug)
100
		$(use_with debug run-debug)
96
		$(use_with icu)
101
		$(use_with icu)
97
		$(use_with python)
102
		$(use_with python)
Lines 111-118 Link Here
111
	if use python; then
116
	if use python; then
112
		python_copy_sources python
117
		python_copy_sources python
113
		building() {
118
		building() {
114
			emake PYTHON_INCLUDES="$(python_get_includedir)" \
119
			emake PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \
115
				PYTHON_SITE_PACKAGES="$(python_get_sitedir)"
120
				PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)"
116
		}
121
		}
117
		python_execute_function -s --source-dir python building
122
		python_execute_function -s --source-dir python building
118
	fi
123
	fi
Lines 131-145 Link Here
131
136
132
src_install() {
137
src_install() {
133
	emake DESTDIR="${D}" \
138
	emake DESTDIR="${D}" \
134
		EXAMPLES_DIR=/usr/share/doc/${PF}/examples \
139
		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
135
		install || die "Installation failed"
140
		install || die "Installation failed"
136
141
142
	# on windows, xmllint is installed by interix libxml2 in parent prefix.
143
	# this is the version to use. the native winnt version does not support
144
	# symlinks, which makes repoman fail if the portage tree is linked in
145
	# from another location (which is my default). -- mduft
146
	if [[ ${CHOST} == *-winnt* ]]; then
147
		rm -rf "${ED}"/usr/bin/xmllint
148
		rm -rf "${ED}"/usr/bin/xmlcatalog
149
	fi
150
137
	if use python; then
151
	if use python; then
138
		installation() {
152
		installation() {
139
			emake DESTDIR="${D}" \
153
			emake DESTDIR="${D}" \
140
				PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
154
				PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
141
				docsdir=/usr/share/doc/${PF}/python \
155
				docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
142
				exampledir=/usr/share/doc/${PF}/python/examples \
156
				exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
143
				install
157
				install
144
		}
158
		}
145
		python_execute_function -s --source-dir python installation
159
		python_execute_function -s --source-dir python installation
Lines 173-179 Link Here
173
190
174
	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
191
	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
175
	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
192
	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
176
	if [ "${EROOT}" != "/" ]
193
	if [ "${ROOT}" != "/" ]
177
	then
194
	then
178
		elog "Skipping XML catalog creation for stage building (bug #208887)."
195
		elog "Skipping XML catalog creation for stage building (bug #208887)."
179
	else
196
	else
Lines 185-191 Link Here
185
		# <obz@gentoo.org>
202
		# <obz@gentoo.org>
186
		if [ ! -e ${CATALOG} ]; then
203
		if [ ! -e ${CATALOG} ]; then
187
			[ -d "${EROOT}etc/xml" ] || mkdir -p "${EROOT}etc/xml"
204
			[ -d "${EROOT}etc/xml" ] || mkdir -p "${EROOT}etc/xml"
188
			/usr/bin/xmlcatalog --create > ${CATALOG}
205
			"${EPREFIX}"/usr/bin/xmlcatalog --create > ${CATALOG}
189
			einfo "Created XML catalog in ${CATALOG}"
206
			einfo "Created XML catalog in ${CATALOG}"
190
		fi
207
		fi
191
	fi
208
	fi

Return to bug 317891