Line
Link Here
|
0 |
-- subversion-1.14.0.ebuild |
0 |
++ subversion-1.14.0-r1.ebuild |
Lines 98-103
Link Here
|
98 |
|
98 |
|
99 |
want_apache |
99 |
want_apache |
100 |
|
100 |
|
|
|
101 |
PATCHES=( "${FILESDIR}"/${P}-py3c-1.1.patch ) |
102 |
|
101 |
pkg_setup() { |
103 |
pkg_setup() { |
102 |
if use berkdb ; then |
104 |
if use berkdb ; then |
103 |
local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ |
105 |
local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ |
Lines 160-166
Link Here
|
160 |
rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die |
162 |
rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die |
161 |
|
163 |
|
162 |
eapply "${WORKDIR}/patches" |
164 |
eapply "${WORKDIR}/patches" |
163 |
eapply_user |
165 |
default |
164 |
|
166 |
|
165 |
chmod +x build/transform_libtool_scripts.sh || die |
167 |
chmod +x build/transform_libtool_scripts.sh || die |
166 |
|
168 |
|
Lines 212-218
Link Here
|
212 |
) |
214 |
) |
213 |
|
215 |
|
214 |
if use python || use perl || use ruby; then |
216 |
if use python || use perl || use ruby; then |
215 |
myconf+=( --with-swig ) |
217 |
myconf+=( |
|
|
218 |
--with-py3c=${S}/py3c |
219 |
--with-swig |
220 |
) |
216 |
else |
221 |
else |
217 |
myconf+=( --without-swig ) |
222 |
myconf+=( --without-swig ) |
218 |
fi |
223 |
fi |
Lines 269-278
Link Here
|
269 |
# https://bugs.gentoo.org/721300 |
274 |
# https://bugs.gentoo.org/721300 |
270 |
append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc |
275 |
append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc |
271 |
|
276 |
|
|
|
277 |
python_get_includedir |
272 |
# allow overriding Python include directory |
278 |
# allow overriding Python include directory |
273 |
ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \ |
279 |
ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \ |
274 |
ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \ |
280 |
ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \ |
275 |
ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ |
281 |
ac_cv_python_includes="-I${PYTHON_INCLUDEDIR}" \ |
276 |
econf "${myconf[@]}" |
282 |
econf "${myconf[@]}" |
277 |
} |
283 |
} |
278 |
|
284 |
|
Lines 294-300
Link Here
|
294 |
rm -f ${p} || die |
300 |
rm -f ${p} || die |
295 |
ln -s "${BUILD_DIR}" ${p} || die |
301 |
ln -s "${BUILD_DIR}" ${p} || die |
296 |
|
302 |
|
297 |
python_export PYTHON_INCLUDEDIR |
303 |
python_get_includedir |
298 |
emake swig-py \ |
304 |
emake swig-py \ |
299 |
swig_pydir="$(python_get_sitedir)/libsvn" \ |
305 |
swig_pydir="$(python_get_sitedir)/libsvn" \ |
300 |
swig_pydir_extra="$(python_get_sitedir)/svn" |
306 |
swig_pydir_extra="$(python_get_sitedir)/svn" |
Lines 385-390
Link Here
|
385 |
|
391 |
|
386 |
BUILD_DIR=python \ |
392 |
BUILD_DIR=python \ |
387 |
python_foreach_impl swig_py_install |
393 |
python_foreach_impl swig_py_install |
|
|
394 |
python_foreach_impl python_optimize |
388 |
fi |
395 |
fi |
389 |
|
396 |
|
390 |
if use perl ; then |
397 |
if use perl ; then |