From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9948138359 for ; Thu, 7 May 2020 00:11:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14695E08AB; Thu, 7 May 2020 00:11:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA494E08AB for ; Thu, 7 May 2020 00:11:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E882734F3BF for ; Thu, 7 May 2020 00:11:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53ADC1E7 for ; Thu, 7 May 2020 00:11:02 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1588810111.5c65a2dac4c2fbe6027aa7350b40f2dd54d4ae04.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/subversion/subversion-1.13.0-r1.ebuild X-VCS-Directories: dev-vcs/subversion/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 5c65a2dac4c2fbe6027aa7350b40f2dd54d4ae04 X-VCS-Branch: master Date: Thu, 7 May 2020 00:11:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d93da4a-5a50-4282-82cf-24a61ee28207 X-Archives-Hash: 6773d395175ab5f8c2da008bf53fdebb commit: 5c65a2dac4c2fbe6027aa7350b40f2dd54d4ae04 Author: Mike Gilbert gentoo org> AuthorDate: Thu May 7 00:08:03 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu May 7 00:08:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c65a2da dev-vcs/subversion: fix build with >=dev-libs/libutf8proc-2.5.0 Closes: https://bugs.gentoo.org/721300 Signed-off-by: Mike Gilbert gentoo.org> 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 9534bafbacb..3cf9f17eab2 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") \