From 5c65a2dac4c2fbe6027aa7350b40f2dd54d4ae04 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 6 May 2020 20:08:03 -0400 Subject: [PATCH] dev-vcs/subversion: fix build with >=dev-libs/libutf8proc-2.5.0 Closes: https://bugs.gentoo.org/721300 Signed-off-by: Mike Gilbert --- dev-vcs/subversion/subversion-1.13.0-r1.ebuild | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild b/dev-vcs/subversion/subversion-1.13.0-r1.ebuild index 9534bafbacb7..3cf9f17eab26 100644 --- a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild +++ b/dev-vcs/subversion/subversion-1.13.0-r1.ebuild @@ -154,6 +154,9 @@ pkg_setup() { } src_prepare() { + # https://bugs.gentoo.org/721300 + rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die + eapply "${WORKDIR}/patches" eapply_user @@ -260,6 +263,10 @@ src_configure() { export ac_cv_python_compile="$(tc-getCC)" fi + # Remove when >=dev-libs/libutf8proc-2.5.0 is stable + # https://bugs.gentoo.org/721300 + append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc + # allow overriding Python include directory ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \ ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \ -- 2.26.2