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 2199F138334 for ; Sat, 16 Mar 2019 22:56:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38272E09C0; Sat, 16 Mar 2019 22:56:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 11A70E09C0 for ; Sat, 16 Mar 2019 22:56:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 EE25F335C97 for ; Sat, 16 Mar 2019 22:56:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97BED559 for ; Sat, 16 Mar 2019 22:56:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1552776975.2e57eba2afd0eef70172501fa51b6e937db6f8d6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/gdal/gdal-2.4.0.ebuild X-VCS-Directories: sci-libs/gdal/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2e57eba2afd0eef70172501fa51b6e937db6f8d6 X-VCS-Branch: master Date: Sat, 16 Mar 2019 22:56:31 +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: 363a8fce-3b58-4a0e-ae5d-1f0a3597da5f X-Archives-Hash: c2c59b460c0c29701b0a87083a2d29d8 commit: 2e57eba2afd0eef70172501fa51b6e937db6f8d6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 16 22:55:20 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 16 22:56:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e57eba2 sci-libs/gdal: Fix build with poppler-0.72 and 0.73 Closes: https://bugs.gentoo.org/680530 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/gdal/gdal-2.4.0.ebuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sci-libs/gdal/gdal-2.4.0.ebuild b/sci-libs/gdal/gdal-2.4.0.ebuild index 6341ce2b6ae..3faf2202c97 100644 --- a/sci-libs/gdal/gdal-2.4.0.ebuild +++ b/sci-libs/gdal/gdal-2.4.0.ebuild @@ -117,6 +117,11 @@ src_prepare() { -i swig/python/setup.cfg || die "sed python setup.cfg failed" default + + # fixed in git master or what will become 2.4.1: + has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch" + has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch" + eautoreconf }